Merge pull request #21 from redhat-cop/java21-node20-python311

Add a new devspaces-java21-node20-python311 image
redhat-cop · Jul 31, 2024 · 361e6dc · 361e6dc
2 parents 3388b66 + 2f501d1
commit 361e6dc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/.github/workflows/post-merge.yaml b/.github/workflows/post-merge.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: [ 'cekit-builder', 'devspaces-base', 'devspaces-openjdk-17', 'devspaces-nodejs-18', 'devspaces-nodejs-20', 'devspaces-java-node-combined', 'devspaces-nested-podman', 'devspaces-python-311' ]
+        image: [ 'cekit-builder', 'devspaces-base', 'devspaces-openjdk-17', 'devspaces-nodejs-18', 'devspaces-nodejs-20', 'devspaces-java-node-combined', 'devspaces-nested-podman', 'devspaces-python-311', 'devspaces-java21-node20-python311' ]
     uses: ./.github/workflows/cekit-build.yaml
     with:
       tag: quay.io/redhat-cop/${{ matrix.image }}:latest

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: [ 'cekit-builder', 'devspaces-base', 'devspaces-openjdk-17', 'devspaces-nodejs-18', 'devspaces-nodejs-20', 'devspaces-java-node-combined', 'devspaces-nested-podman', 'devspaces-python-311' ]
+        image: [ 'cekit-builder', 'devspaces-base', 'devspaces-openjdk-17', 'devspaces-nodejs-18', 'devspaces-nodejs-20', 'devspaces-java-node-combined', 'devspaces-nested-podman', 'devspaces-python-311', 'devspaces-java21-node20-python311' ]
     uses: ./.github/workflows/cekit-build.yaml
     with:
       tag: quay.io/redhat-cop/${{ matrix.image }}:pr-${{ github.sha }}

diff --git a/images/devspaces-java21-node20-python311.yaml b/images/devspaces-java21-node20-python311.yaml
@@ -0,0 +1,15 @@
+name: devspaces-java21-node20-python311.yaml
+from: registry.access.redhat.com/ubi9/openjdk-21:1.18-4
+version: &version 1.0
+packages:
+  manager: microdnf
+  manager_flags: "--disableplugin=subscription-manager --setopt=tsflags=nodocs --setopt=install_weak_deps=0"
+envs:
+- name: TOOLS_DIR
+  value: /usr/local/tools
+modules:
+  install:
+  - name: node20
+  - name: angular
+  - name: quarkus
+  - name: python3.11
diff --git a/modules/python3.11/alternatives.sh b/modules/python3.11/alternatives.sh
@@ -0,0 +1,3 @@
+#! /bin/bash
+sudo alternatives --install /usr/bin/python python /usr/bin/python3.11 1
+python --version
diff --git a/modules/python3.11/module.yaml b/modules/python3.11/module.yaml
@@ -0,0 +1,10 @@
+schema_version: 1
+name: python3.11
+version: v1.0
+description: "Installs Python 3.11"
+packages:
+  install:
+  - python3.11-pip 
+  - python3.11-devel
+execute:
+- script: alternatives.sh