Merge pull request #2 from troll-os/openex-featurebranch-actions

made java versions and packages coherent
troll-os · Feb 15, 2024 · 8c55cc8 · 8c55cc8
2 parents a3870b5 + f44bd9b
commit 8c55cc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/test-feature-branch.yml b/.github/workflows/test-feature-branch.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           branch: v3.18
           packages: >
-            nodejs npm git tini gcc g++ make musl-dev cargo default-jre maven postfix postfix-pcre
+            nodejs npm git tini gcc g++ make musl-dev cargo openjdk21-jdk maven postfix postfix-pcre
 
       - name: Setup Node.js
         run: |

diff --git a/Dockerfile_ga b/Dockerfile_ga
@@ -1,4 +1,4 @@
-FROM openjdk:19-jdk-alpine AS app
+FROM openjdk:21-jdk-slim AS app
 
 WORKDIR /opt
 RUN apk add tini git