Skip to content

Commit 025c2b1

Browse files
committed
[OPENJDK-2588] install tar in the runtime images
`oc rsync` requires either `tar` or `rsync` to be present in the container images. `oc cp` requires `tar`. Install `tar` in the runtime images so that both `oc` commands function. This results in a negligible (+0.6MiB) increase in container size. <https://issues.redhat.com/browse/OPENJDK-2588> `tar` and `rsync` are already present in the builder images. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 20f0de9 commit 025c2b1

File tree

6 files changed

+23
-4
lines changed

6 files changed

+23
-4
lines changed

modules/tar/module.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schema_version: 1
2+
name: jboss.container.tar
3+
version: '1.0'
4+
description: Installs the Tar RPM to enable `oc cp` and `oc rsync`
5+
6+
packages:
7+
install:
8+
- tar

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 tar is installed (OPENJDK-2588)
124+
When container is started with args
125+
| arg | value |
126+
| command | tar |
127+
Then available container log should not contain command not found

ubi8-openjdk-11-runtime.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +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: "11"
50-
- name: jboss.container.java.jre.run
51-
- name: jboss.container.util.pkg-update
51+
- name: jboss.container.tar
52+
- name: jboss.container.java.jre.run
5253

5354
help:
5455
add: true

ubi8-openjdk-17-runtime.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +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: "17"
50-
- name: jboss.container.java.jre.run
51-
- name: jboss.container.util.pkg-update
51+
- name: jboss.container.tar
52+
- name: jboss.container.java.jre.run
5253

5354
help:
5455
add: true

ubi8-openjdk-21-runtime.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ modules:
4646
- path: modules
4747
install:
4848
- name: jboss.container.util.pkg-update
49+
- name: jboss.container.tar
4950
- name: jboss.container.openjdk.jre
5051
version: "21"
5152
- name: jboss.container.java.jre.run

ubi8-openjdk-8-runtime.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ modules:
4848
- name: jboss.container.openjdk.jre
4949
version: "8"
5050
- name: jboss.container.java.jre.run
51+
- name: jboss.container.tar
5152
- name: jboss.container.util.pkg-update
5253

5354
help:

0 commit comments

Comments
 (0)