Merge pull request #443 from jmtd/OPENJDK-2587-tzdata-reorder-ubi8

[Openjdk-2587] ensure pkg-update happens before reinstall tzdata (ubi8)

Author: jmtd

modules/util/tzdata/module.yaml

@@ -1,7 +1,14 @@
 schema_version: 1
 name: jboss.container.util.tzdata
 version: '1.0'
-description: Reinstall the tzdata package, to ensure zoneinfo is present
+description: Reinstall the tzdata package, to ensure zoneinfo is present.
+
+# if the base image tzdata version is not available on the RPM mirrors (such as
+# when it has been updated), the reinstall action will fail. To prevent this,
+# run pkg-update first.
+modules:
+  install:
+  - name: jboss.container.util.pkg-update
 
 execute:
 - script: execute.sh

ubi8-openjdk-11.yaml

@@ -47,6 +47,7 @@ modules:
   repositories:
   - path: modules
   install:
+  - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jdk
     version: "11"
   - name: jboss.container.prometheus
@@ -55,7 +56,6 @@ modules:
   - name: jboss.container.maven
     version: "3.8.11"
   - name: jboss.container.java.s2i.bash
-  - name: jboss.container.util.pkg-update
   - name: jboss.container.util.tzdata
   # required due to jolokia
   - name: jboss.container.java.singleton-jdk

ubi8-openjdk-17.yaml

@@ -47,6 +47,7 @@ modules:
   repositories:
   - path: modules
   install:
+  - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jdk
     version: "17"
   - name: jboss.container.prometheus
@@ -55,7 +56,6 @@ modules:
     version: "3.8.17"
   - name: jboss.container.util.tzdata
   - name: jboss.container.java.s2i.bash
-  - name: jboss.container.util.pkg-update
 
 help:
   add: true

ubi8-openjdk-8-runtime.yaml

@@ -45,11 +45,11 @@ modules:
   repositories:
   - path: modules
   install:
+  - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jre
     version: "8"
   - name:  jboss.container.java.jre.run
   - name: jboss.container.tar
-  - name: jboss.container.util.pkg-update
   - name: jboss.container.util.tzdata
 
 help:

ubi8-openjdk-8.yaml

@@ -47,6 +47,7 @@ modules:
   repositories:
   - path: modules
   install:
+  - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jdk
     version: "8"
   - name: jboss.container.prometheus
@@ -55,7 +56,6 @@ modules:
   - name: jboss.container.maven
     version: "3.8.8"
   - name: jboss.container.java.s2i.bash
-  - name: jboss.container.util.pkg-update
   - name: jboss.container.util.tzdata
 
 help: