From 66b0bcfc27fad84e6737c37fc5bd39886176b4ee Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 18 Feb 2025 13:38:35 +0000 Subject: [PATCH] [OPENJDK-3659] remove python Hopefully temporary, see RHEL-79260. Signed-off-by: Jonathan Dowland --- modules/util/rm-python/execute.sh | 4 ++++ modules/util/rm-python/module.yaml | 7 ++++++ ubi10-openjdk-21.yaml | 35 ++++++++++++++++++++++++++++++ ubi9-openjdk-21-runtime.yaml | 1 + ubi9-openjdk-21.yaml | 1 + 5 files changed, 48 insertions(+) create mode 100755 modules/util/rm-python/execute.sh create mode 100644 modules/util/rm-python/module.yaml create mode 100644 ubi10-openjdk-21.yaml diff --git a/modules/util/rm-python/execute.sh b/modules/util/rm-python/execute.sh new file mode 100755 index 00000000..7cd24ee5 --- /dev/null +++ b/modules/util/rm-python/execute.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -euo pipefail + +rpm -e $(rpm -qa python*) diff --git a/modules/util/rm-python/module.yaml b/modules/util/rm-python/module.yaml new file mode 100644 index 00000000..fe478e83 --- /dev/null +++ b/modules/util/rm-python/module.yaml @@ -0,0 +1,7 @@ +schema_version: 1 +name: jboss.container.util.rm-python +version: '1.0' +description: Remove python packages + +execute: +- script: execute.sh diff --git a/ubi10-openjdk-21.yaml b/ubi10-openjdk-21.yaml new file mode 100644 index 00000000..4e2f8fcf --- /dev/null +++ b/ubi10-openjdk-21.yaml @@ -0,0 +1,35 @@ +# This is an Image descriptor for +schema_version: 1 + +from: "quay.io/centos/centos:stream10-minimal" +name: &name "ubi10/openjdk-21" +version: &version "1.21" +description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21" + +labels: +- name: "com.redhat.component" + value: "openjdk-21-ubi10-container" +- name: "name" + value: *name +- name: "version" + value: *version + +envs: +- name: "JBOSS_IMAGE_NAME" + value: *name +- name: "JBOSS_IMAGE_VERSION" + value: *version + +modules: + repositories: + - path: modules + install: + - name: common + - name: jboss.container.util.RHEL-67389 + - name: jboss.container.util.rm-python + - name: jboss.container.util.pkg-update + - name: jboss.container.openjdk.jdk + version: "21" + - name: jboss.container.maven + version: "3.8.21" + - name: jboss.container.java.s2i.bash diff --git a/ubi9-openjdk-21-runtime.yaml b/ubi9-openjdk-21-runtime.yaml index 74400dd2..8325bcfd 100644 --- a/ubi9-openjdk-21-runtime.yaml +++ b/ubi9-openjdk-21-runtime.yaml @@ -45,6 +45,7 @@ modules: repositories: - path: modules install: + - name: jboss.container.rm-python - name: jboss.container.util.pkg-update - name: jboss.container.tar - name: jboss.container.openjdk.jre diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml index 5caddc97..e192b6b4 100644 --- a/ubi9-openjdk-21.yaml +++ b/ubi9-openjdk-21.yaml @@ -47,6 +47,7 @@ modules: repositories: - path: modules install: + - name: jboss.container.rm-python - name: jboss.container.util.pkg-update - name: jboss.container.openjdk.jdk version: "21"