diff --git a/modules/util/tzdata/module.yaml b/modules/util/tzdata/module.yaml index bc669456..dd0d1a11 100644 --- a/modules/util/tzdata/module.yaml +++ b/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 diff --git a/ubi8-openjdk-11.yaml b/ubi8-openjdk-11.yaml index 83e56157..297e7ac4 100644 --- a/ubi8-openjdk-11.yaml +++ b/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 diff --git a/ubi8-openjdk-17.yaml b/ubi8-openjdk-17.yaml index 1e1c6609..0284a3af 100644 --- a/ubi8-openjdk-17.yaml +++ b/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 diff --git a/ubi8-openjdk-8-runtime.yaml b/ubi8-openjdk-8-runtime.yaml index cc5e490f..325990f8 100644 --- a/ubi8-openjdk-8-runtime.yaml +++ b/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: diff --git a/ubi8-openjdk-8.yaml b/ubi8-openjdk-8.yaml index 8ddeed35..c2753e45 100644 --- a/ubi8-openjdk-8.yaml +++ b/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: