fix

sbt · Aug 1, 2022 · cc1d2bb · cc1d2bb
1 parent 0aa3be3
commit cc1d2bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,10 +29,8 @@ jobs:
           'eclipse-temurin-18.0.1',
           'eclipse-temurin-17.0.3',
           'eclipse-temurin-11.0.15',
-          'amazon-corretto-18.0.2',
           'amazon-corretto-17.0.4',
-          'amazon-corretto-11.0.16',
-          'amazon-corretto-8u342'
+          'amazon-corretto-11.0.16'
         ]
         include:
           - javaTag: '8u332'
@@ -79,10 +77,6 @@ jobs:
             dockerContext: 'eclipse-temurin'
             baseImageTag: '11.0.15_10-jdk'
             platforms: 'linux/amd64,linux/arm64'
-          - javaTag: 'amazon-corretto-18.0.2'
-            dockerContext: 'amazon-corretto'
-            baseImageTag: '18.0.2'
-            platforms: 'linux/amd64,linux/arm64'
           - javaTag: 'amazon-corretto-17.0.4'
             dockerContext: 'amazon-corretto'
             baseImageTag: '17.0.4'
@@ -91,10 +85,6 @@ jobs:
             dockerContext: 'amazon-corretto'
             baseImageTag: '11.0.16'
             platforms: 'linux/amd64,linux/arm64'
-          - javaTag: 'amazon-corretto-8u342'
-            dockerContext: 'amazon-corretto'
-            baseImageTag: '8u342'
-            platforms: 'linux/amd64,linux/arm64'
     steps:
     - uses: actions/checkout@v1
     - name: Set up QEMU

diff --git a/amazon-corretto/Dockerfile b/amazon-corretto/Dockerfile
@@ -6,7 +6,7 @@
 
 # Pull base image
 ARG BASE_IMAGE_TAG
-FROM amazoncorretto:${BASE_IMAGE_TAG:-18.0.2}
+FROM amazoncorretto:${BASE_IMAGE_TAG:-17.0.4}
 
 # Env variables
 ARG SCALA_VERSION
@@ -21,7 +21,7 @@ ENV GROUP_ID ${GROUP_ID:-1001}
 # Install git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114)
 RUN yum -y update && \
   yum -y install tar gzip git rpm && \
-  rm -rf /var/cache/yum * && \
+  rm -rf /var/cache/yum/* && \
   yum clean all
 
 # Install sbt