Merge pull request #428 from jmtd/OPENJDK-2588-tar

[Openjdk 2588] install tar in runtime images (ubi8)
rh-openjdk · Jan 10, 2024 · 140a10e · 140a10e
2 parents 20f0de9 + 025c2b1
commit 140a10e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/modules/tar/module.yaml b/modules/tar/module.yaml
@@ -0,0 +1,8 @@
+schema_version: 1
+name: jboss.container.tar
+version: '1.0'
+description: Installs the Tar RPM to enable `oc cp` and `oc rsync`
+
+packages:
+  install:
+  - tar
diff --git a/tests/features/java/openjdk.feature b/tests/features/java/openjdk.feature
@@ -118,3 +118,10 @@ Feature: Miscellaneous OpenJDK-related unit tests
     Then container log should not contain libpwquality
     Then container log should not contain libxkbcommon
     Then container log should not contain kbd
+
+  @ubi8
+  Scenario: Ensure tar is installed (OPENJDK-2588)
+    When container is started with args
+    | arg     | value |
+    | command | tar   |
+    Then available container log should not contain command not found
diff --git a/ubi8-openjdk-11-runtime.yaml b/ubi8-openjdk-11-runtime.yaml
@@ -45,10 +45,11 @@ modules:
   repositories:
   - path: modules
   install:
+  - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jre
     version: "11"
-  - name:  jboss.container.java.jre.run
-  - name: jboss.container.util.pkg-update
+  - name: jboss.container.tar
+  - name: jboss.container.java.jre.run
 
 help:
   add: true

diff --git a/ubi8-openjdk-17-runtime.yaml b/ubi8-openjdk-17-runtime.yaml
@@ -45,10 +45,11 @@ modules:
   repositories:
   - path: modules
   install:
+  - name: jboss.container.util.pkg-update
   - name: jboss.container.openjdk.jre
     version: "17"
-  - name:  jboss.container.java.jre.run
-  - name: jboss.container.util.pkg-update
+  - name: jboss.container.tar
+  - name: jboss.container.java.jre.run
 
 help:
   add: true

diff --git a/ubi8-openjdk-21-runtime.yaml b/ubi8-openjdk-21-runtime.yaml
@@ -46,6 +46,7 @@ modules:
   - path: modules
   install:
   - name: jboss.container.util.pkg-update
+  - name: jboss.container.tar
   - name: jboss.container.openjdk.jre
     version: "21"
   - name: jboss.container.java.jre.run

diff --git a/ubi8-openjdk-8-runtime.yaml b/ubi8-openjdk-8-runtime.yaml
@@ -48,6 +48,7 @@ modules:
   - name: jboss.container.openjdk.jre
     version: "8"
   - name:  jboss.container.java.jre.run
+  - name: jboss.container.tar
   - name: jboss.container.util.pkg-update
 
 help: