Skip to content

Commit cf906c7

Browse files
committed
[OPENJDK-2587] Ensure pkg-update runs before tzdata module
The tzdata module, which calls "microdnf reinstall tzdata", may fail if the base image has an installed tzdata RPM that is no longer available on the mirrors / is out-of-date. For example base image installed RPM: tzdata-2023d-1.el8.noarch attempt to build ubi8-openjdk-17 (where tzdata module is first) "Installed package tzdata-2023d-1.el8.noarch not available" The fix is to move the pkg-update module to be earlier. Do this for all images, for consistency, place pkg-update first. (This matches the ubi9 images) I have not included a unit test as I am not sure how to approach mocking older/newer RPM versions in a controllable way. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 3c8da9c commit cf906c7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ubi8-openjdk-11.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ modules:
4747
repositories:
4848
- path: modules
4949
install:
50+
- name: jboss.container.util.pkg-update
5051
- name: jboss.container.openjdk.jdk
5152
version: "11"
5253
- name: jboss.container.prometheus
@@ -55,7 +56,6 @@ modules:
5556
- name: jboss.container.maven
5657
version: "3.8.11"
5758
- name: jboss.container.java.s2i.bash
58-
- name: jboss.container.util.pkg-update
5959
- name: jboss.container.util.tzdata
6060
# required due to jolokia
6161
- name: jboss.container.java.singleton-jdk

ubi8-openjdk-17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ modules:
4747
repositories:
4848
- path: modules
4949
install:
50+
- name: jboss.container.util.pkg-update
5051
- name: jboss.container.openjdk.jdk
5152
version: "17"
5253
- name: jboss.container.prometheus
@@ -55,7 +56,6 @@ modules:
5556
version: "3.8.17"
5657
- name: jboss.container.util.tzdata
5758
- name: jboss.container.java.s2i.bash
58-
- name: jboss.container.util.pkg-update
5959

6060
help:
6161
add: true

ubi8-openjdk-8-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ modules:
4545
repositories:
4646
- path: modules
4747
install:
48+
- name: jboss.container.util.pkg-update
4849
- name: jboss.container.openjdk.jre
4950
version: "8"
5051
- name: jboss.container.java.jre.run
5152
- name: jboss.container.tar
52-
- name: jboss.container.util.pkg-update
5353
- name: jboss.container.util.tzdata
5454

5555
help:

ubi8-openjdk-8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ modules:
4747
repositories:
4848
- path: modules
4949
install:
50+
- name: jboss.container.util.pkg-update
5051
- name: jboss.container.openjdk.jdk
5152
version: "8"
5253
- name: jboss.container.prometheus
@@ -55,7 +56,6 @@ modules:
5556
- name: jboss.container.maven
5657
version: "3.8.8"
5758
- name: jboss.container.java.s2i.bash
58-
- name: jboss.container.util.pkg-update
5959
- name: jboss.container.util.tzdata
6060

6161
help:

0 commit comments

Comments
 (0)