Skip to content

Commit 21a0905

Browse files
committed
[OPENJDK-1334] Move pkg-update to end of container build
This causes the "microdnf update" to take place after all the RPMs that are explicitly or implicitly installed by OpenJDK, Maven, etc have been installed. This works around the issue described in RHELDST-15034. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 91f0511 commit 21a0905

6 files changed

+6
-6
lines changed

ubi8-openjdk-11-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ modules:
3737
repositories:
3838
- path: modules
3939
install:
40-
- name: jboss.container.util.pkg-update
4140
- name: jboss.container.openjdk.jre
4241
version: "11"
4342
- name: jboss.container.java.jre.run
43+
- name: jboss.container.util.pkg-update
4444

4545
help:
4646
add: true

ubi8-openjdk-11.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ modules:
4141
repositories:
4242
- path: modules
4343
install:
44-
- name: jboss.container.util.pkg-update
4544
- name: jboss.container.openjdk.jdk
4645
version: "11"
4746
- name: jboss.container.prometheus
@@ -50,6 +49,7 @@ modules:
5049
- name: jboss.container.maven
5150
version: "8.6.3.6.11"
5251
- name: jboss.container.java.s2i.bash
52+
- name: jboss.container.util.pkg-update
5353
# required due to jolokia
5454
- name: jboss.container.java.singleton-jdk
5555

ubi8-openjdk-17-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ modules:
3939
repositories:
4040
- path: modules
4141
install:
42-
- name: jboss.container.util.pkg-update
4342
- name: jboss.container.openjdk.jre
4443
version: "17"
4544
- name: jboss.container.java.jre.run
45+
- name: jboss.container.util.pkg-update
4646

4747
help:
4848
add: true

ubi8-openjdk-17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ modules:
4141
repositories:
4242
- path: modules
4343
install:
44-
- name: jboss.container.util.pkg-update
4544
- name: jboss.container.openjdk.jdk
4645
version: "17"
4746
- name: jboss.container.prometheus
4847
version: "8.6.17"
4948
- name: jboss.container.maven
5049
version: "8.6.3.6.17"
5150
- name: jboss.container.java.s2i.bash
51+
- name: jboss.container.util.pkg-update
5252
# needed for after Maven: https://bugzilla.redhat.com/show_bug.cgi?id=2080229
5353
- name: jboss.container.java.singleton-jdk
5454

ubi8-openjdk-8-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ modules:
3737
repositories:
3838
- path: modules
3939
install:
40-
- name: jboss.container.util.pkg-update
4140
- name: jboss.container.openjdk.jre
4241
version: "8"
4342
- name: jboss.container.java.jre.run
43+
- name: jboss.container.util.pkg-update
4444

4545
help:
4646
add: true

ubi8-openjdk-8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ modules:
4141
repositories:
4242
- path: modules
4343
install:
44-
- name: jboss.container.util.pkg-update
4544
- name: jboss.container.openjdk.jdk
4645
version: "8"
4746
- name: jboss.container.prometheus
@@ -50,6 +49,7 @@ modules:
5049
- name: jboss.container.maven
5150
version: "8.2.3.6.8"
5251
- name: jboss.container.java.s2i.bash
52+
- name: jboss.container.util.pkg-update
5353

5454
help:
5555
add: true

0 commit comments

Comments
 (0)