Skip to content

Commit 78f78b3

Browse files
committed
[OPENJDK-2587] Add tzdata module to reinstall tzdata
tzdata is deliberately broken in ubi-minimal images (presumably for disk space reasons). The fix is to reinstall the tzdata package: <https://access.redhat.com/solutions/5616681> This appears to add a neglibible amount to our image sizes (<1%) but resolves TZ issues for Java applications. <https://issues.redhat.com/browse/OPENJDK-2587> Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 6934255 commit 78f78b3

File tree

9 files changed

+36
-2
lines changed

9 files changed

+36
-2
lines changed

modules/util/tzdata/execute.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
for candidate in yum dnf microdnf; do
5+
if command -v "$candidate"; then
6+
mgr="$(command -v "$candidate")"
7+
"$mgr" reinstall tzdata -y && \
8+
"$mgr" -y clean all
9+
exit
10+
fi
11+
done
12+
13+
echo "cannot find a package manager" >&2
14+
exit 1

modules/util/tzdata/module.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
schema_version: 1
2+
name: jboss.container.util.tzdata
3+
version: '1.0'
4+
description: Reinstall the tzdata package, to ensure zoneinfo is present
5+
6+
execute:
7+
- script: execute.sh

tests/features/java/openjdk.feature

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,10 @@ Feature: Miscellaneous OpenJDK-related unit tests
118118
Then container log should not contain libpwquality
119119
Then container log should not contain libxkbcommon
120120
Then container log should not contain kbd
121+
122+
@ubi8
123+
Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2587)
124+
When container is started with args
125+
| arg | value |
126+
| command | rpm -V tzdata |
127+
Then available container log should not contain missing

ubi8-openjdk-11-runtime.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ modules:
4343
install:
4444
- name: jboss.container.openjdk.jre
4545
version: "11"
46-
- name: jboss.container.java.jre.run
4746
- name: jboss.container.util.pkg-update
47+
- name: jboss.container.util.tzdata
48+
- name: jboss.container.java.jre.run
4849

4950
help:
5051
add: true

ubi8-openjdk-11.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ modules:
5252
version: "3.8.11"
5353
- name: jboss.container.java.s2i.bash
5454
- name: jboss.container.util.pkg-update
55+
- name: jboss.container.util.tzdata
5556
# required due to jolokia
5657
- name: jboss.container.java.singleton-jdk
5758

ubi8-openjdk-17-runtime.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ modules:
4343
install:
4444
- name: jboss.container.openjdk.jre
4545
version: "17"
46-
- name: jboss.container.java.jre.run
4746
- name: jboss.container.util.pkg-update
47+
- name: jboss.container.util.tzdata
48+
- name: jboss.container.java.jre.run
4849

4950
help:
5051
add: true

ubi8-openjdk-17.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ modules:
4949
version: "8.6.17"
5050
- name: jboss.container.maven
5151
version: "3.8.17"
52+
- name: jboss.container.util.tzdata
5253
- name: jboss.container.java.s2i.bash
5354
- name: jboss.container.util.pkg-update
5455

ubi8-openjdk-21-runtime.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ modules:
4444
- name: jboss.container.util.pkg-update
4545
- name: jboss.container.openjdk.jre
4646
version: "21"
47+
- name: jboss.container.util.tzdata
4748
- name: jboss.container.java.jre.run
4849

4950
help:

ubi8-openjdk-21.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ modules:
4848
version: "21"
4949
- name: jboss.container.maven
5050
version: "3.8.17"
51+
- name: jboss.container.util.tzdata
5152
- name: jboss.container.java.s2i.bash
5253
- name: jboss.container.java.singleton-jdk
5354

0 commit comments

Comments
 (0)