Skip to content

Commit dc3b6a4

Browse files
committed
[OPENJDK-2519] 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-2519> Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 4bc78f0 commit dc3b6a4

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
@@ -89,3 +89,10 @@ Feature: Miscellaneous OpenJDK-related unit tests
8989
| arg | value |
9090
| command | tar |
9191
Then available container log should not contain command not found
92+
93+
@ubi9
94+
Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2519)
95+
When container is started with args
96+
| arg | value |
97+
| command | rpm -V tzdata |
98+
Then available container log should not contain missing

ubi9-openjdk-11-runtime.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ modules:
4949
- name: jboss.container.tar
5050
- name: jboss.container.openjdk.jre
5151
version: "11"
52-
- name: jboss.container.java.jre.run
52+
- name: jboss.container.util.tzdata
53+
- name: jboss.container.java.jre.run
5354

5455
help:
5556
add: true

ubi9-openjdk-11.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ modules:
5252
version: "11"
5353
- name: jboss.container.maven
5454
version: "3.8.11"
55+
- name: jboss.container.util.tzdata
5556
- name: jboss.container.java.s2i.bash
5657

5758
help:

ubi9-openjdk-17-runtime.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ modules:
4949
- name: jboss.container.tar
5050
- name: jboss.container.openjdk.jre
5151
version: "17"
52-
- name: jboss.container.java.jre.run
52+
- name: jboss.container.util.tzdata
53+
- name: jboss.container.java.jre.run
5354

5455
help:
5556
add: true

ubi9-openjdk-17.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ modules:
5252
version: "17"
5353
- name: jboss.container.maven
5454
version: "3.8.17"
55+
- name: jboss.container.util.tzdata
5556
- name: jboss.container.java.s2i.bash
5657

5758
help:

ubi9-openjdk-21-runtime.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ modules:
4747
- name: jboss.container.tar
4848
- name: jboss.container.openjdk.jre
4949
version: "21"
50+
- name: jboss.container.util.tzdata
5051
- name: jboss.container.java.jre.run
5152

5253
help:

ubi9-openjdk-21.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ modules:
5151
- name: jboss.container.maven
5252
version: "3.8.17"
5353
- name: jboss.container.java.s2i.bash
54+
- name: jboss.container.util.tzdata
5455
- name: jboss.container.java.singleton-jdk
5556

5657
help:

0 commit comments

Comments
 (0)