Skip to content

Commit 158f7aa

Browse files
authored
Add fix to 25.0.0.9 (#722)
* Add fixes to 25.0.0.9 Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com> * Update .secrets.baseline --------- Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
1 parent 2cec754 commit 158f7aa

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.secrets.baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
647647
"is_secret": false,
648648
"is_verified": false,
649-
"line_number": 73,
649+
"line_number": 74,
650650
"type": "Hex High Entropy String",
651651
"verified_result": null
652652
}
@@ -696,7 +696,7 @@
696696
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
697697
"is_secret": false,
698698
"is_verified": false,
699-
"line_number": 72,
699+
"line_number": 73,
700700
"type": "Hex High Entropy String",
701701
"verified_result": null
702702
}

ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3737
&& sha1sum -c /tmp/wlp.zip.sha1 \
3838
&& chmod -R g+x /usr/bin \
3939
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
40+
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
41+
&& find /tmp/wlpFixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation /opt/ibm/wlp \
4042
&& chown -R 1001:0 /opt/ibm/wlp \
41-
&& chmod -R g+rw /opt/ibm/wlp \
42-
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/
43+
&& chmod -R g+rw /opt/ibm/wlp
4344

4445
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
4546

ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \
3636
&& sha1sum -c /tmp/wlp.zip.sha1 \
3737
&& chmod -R g+x /usr/bin \
3838
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
39+
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
40+
&& find /tmp/wlpFixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation /opt/ibm/wlp \
3941
&& chown -R 1001:0 /opt/ibm/wlp \
40-
&& chmod -R g+rw /opt/ibm/wlp \
41-
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/
42+
&& chmod -R g+rw /opt/ibm/wlp
4243

4344
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jre-ubi9-minimal
4445

0 commit comments

Comments
 (0)