From 2d6a8cdabbcdf44124e093f5087e7bd122433542 Mon Sep 17 00:00:00 2001 From: Francis De Brabandere Date: Thu, 14 Nov 2024 15:12:50 +0100 Subject: [PATCH 1/3] fix: graalvm scala3 builds --- .github/workflows/build.yml | 15 --------------- graalvm-ce/Dockerfile | 9 +++++++++ graalvm-community/Dockerfile | 9 +++++++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a7744b..fd82f2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,21 +83,6 @@ jobs: dockerContext: 'amazoncorretto' baseImageTag: '17.0.13-al2023' platforms: 'linux/amd64' - exclude: - # https://github.com/VirtusLab/scala-cli/issues/3130 - - scalaVersion: '3.5.2' - javaTag: 'graalvm-community-22.0.1' - - scalaVersion: '3.5.2' - javaTag: 'graalvm-community-21.0.2' - - scalaVersion: '3.5.2' - javaTag: 'graalvm-ce-22.3.3-b1-java17' - # https://github.com/VirtusLab/scala-cli/issues/2758 - # - scalaVersion: '3.5.0' - # javaTag: 'eclipse-temurin-alpine-22_36' - # - scalaVersion: '3.5.0' - # javaTag: 'eclipse-temurin-alpine-21.0.2_13' - # - scalaVersion: '3.5.0' - # javaTag: 'eclipse-temurin-alpine-17.0.10_7' steps: - uses: actions/checkout@v4 - name: Set up QEMU diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile index cfc4157..46c61b5 100644 --- a/graalvm-ce/Dockerfile +++ b/graalvm-ce/Dockerfile @@ -19,6 +19,15 @@ ENV USER_ID=${USER_ID:-1001} ARG GROUP_ID ENV GROUP_ID=${GROUP_ID:-1001} +# Install dependencies +# ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130 +# git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114) +RUN \ + dnf -y update && \ + dnf -y install procps git rpm && \ + rm -rf /var/cache/dnf/* && \ + dnf clean all + # Install sbt RUN \ curl -fsL --show-error "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | tar xfz - -C /usr/share && \ diff --git a/graalvm-community/Dockerfile b/graalvm-community/Dockerfile index 8cc81ea..662c475 100644 --- a/graalvm-community/Dockerfile +++ b/graalvm-community/Dockerfile @@ -19,6 +19,15 @@ ENV USER_ID=${USER_ID:-1001} ARG GROUP_ID ENV GROUP_ID=${GROUP_ID:-1001} +# Install dependencies +# ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130 +# git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114) +RUN \ + dnf -y update && \ + dnf -y install procps git rpm && \ + rm -rf /var/cache/dnf/* && \ + dnf clean all + # Install sbt RUN \ curl -fsL --show-error "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | tar xfz - -C /usr/share && \ From bda1613445026b0984132b25d2993ec81f723b78 Mon Sep 17 00:00:00 2001 From: Francis De Brabandere Date: Thu, 14 Nov 2024 15:20:05 +0100 Subject: [PATCH 2/3] microdnf --- graalvm-ce/Dockerfile | 6 +++--- graalvm-community/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile index 46c61b5..cd1ff56 100644 --- a/graalvm-ce/Dockerfile +++ b/graalvm-ce/Dockerfile @@ -23,10 +23,10 @@ ENV GROUP_ID=${GROUP_ID:-1001} # ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130 # git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114) RUN \ - dnf -y update && \ - dnf -y install procps git rpm && \ + microdnf -y update && \ + microdnf -y install procps git rpm && \ rm -rf /var/cache/dnf/* && \ - dnf clean all + microdnf clean all # Install sbt RUN \ diff --git a/graalvm-community/Dockerfile b/graalvm-community/Dockerfile index 662c475..8007359 100644 --- a/graalvm-community/Dockerfile +++ b/graalvm-community/Dockerfile @@ -23,10 +23,10 @@ ENV GROUP_ID=${GROUP_ID:-1001} # ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130 # git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114) RUN \ - dnf -y update && \ - dnf -y install procps git rpm && \ + microdnf -y update && \ + microdnf -y install procps git rpm && \ rm -rf /var/cache/dnf/* && \ - dnf clean all + microdnf clean all # Install sbt RUN \ From 41a4f7d05c81ad33467a558e03bd3cd146191236 Mon Sep 17 00:00:00 2001 From: Francis De Brabandere Date: Thu, 14 Nov 2024 17:31:12 +0100 Subject: [PATCH 3/3] microdnf update does not work --- graalvm-ce/Dockerfile | 1 - graalvm-community/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile index cd1ff56..056b98f 100644 --- a/graalvm-ce/Dockerfile +++ b/graalvm-ce/Dockerfile @@ -23,7 +23,6 @@ ENV GROUP_ID=${GROUP_ID:-1001} # ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130 # git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114) RUN \ - microdnf -y update && \ microdnf -y install procps git rpm && \ rm -rf /var/cache/dnf/* && \ microdnf clean all diff --git a/graalvm-community/Dockerfile b/graalvm-community/Dockerfile index 8007359..b8f2b8d 100644 --- a/graalvm-community/Dockerfile +++ b/graalvm-community/Dockerfile @@ -23,7 +23,6 @@ ENV GROUP_ID=${GROUP_ID:-1001} # ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130 # git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114) RUN \ - microdnf -y update && \ microdnf -y install procps git rpm && \ rm -rf /var/cache/dnf/* && \ microdnf clean all