From 78392c2b006cbec23101250931e5ed644cb50cca Mon Sep 17 00:00:00 2001 From: Alexandre Balon-Perin Date: Thu, 13 Oct 2022 07:38:40 +0100 Subject: [PATCH] Update to scala 2.13.9 (#221) --- eclipse-temurin/Dockerfile | 6 +++--- graalvm-ce/Dockerfile | 6 +++--- openjdk-oracle/Dockerfile | 8 ++++---- openjdk/Dockerfile | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eclipse-temurin/Dockerfile b/eclipse-temurin/Dockerfile index ad2be11..6f2af41 100644 --- a/eclipse-temurin/Dockerfile +++ b/eclipse-temurin/Dockerfile @@ -10,12 +10,12 @@ FROM eclipse-temurin:${BASE_IMAGE_TAG:-11.0.16.1_1-jdk} # Env variables ARG SCALA_VERSION -ENV SCALA_VERSION ${SCALA_VERSION:-2.13.8} +ENV SCALA_VERSION ${SCALA_VERSION:-2.13.9} ARG SBT_VERSION ENV SBT_VERSION ${SBT_VERSION:-1.6.2} ARG USER_ID ENV USER_ID ${USER_ID:-1001} -ARG GROUP_ID +ARG GROUP_ID ENV GROUP_ID ${GROUP_ID:-1001} # Install sbt @@ -83,6 +83,6 @@ RUN \ ## Users wanting to use this container as non-root should combine the two following arguments ## -u sbtuser ## -w /home/sbtuser -WORKDIR /root +WORKDIR /root CMD sbt diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile index 21256b3..a9d1259 100644 --- a/graalvm-ce/Dockerfile +++ b/graalvm-ce/Dockerfile @@ -10,13 +10,13 @@ FROM ghcr.io/graalvm/graalvm-ce:${BASE_IMAGE_TAG:-java11-21.3.0} # Env variables ARG SCALA_VERSION -ENV SCALA_VERSION ${SCALA_VERSION:-2.13.8} +ENV SCALA_VERSION ${SCALA_VERSION:-2.13.9} ARG SBT_VERSION ENV SBT_VERSION ${SBT_VERSION:-1.6.2} -ENV JAVA_OPTS -XX:+UseG1GC +ENV JAVA_OPTS -XX:+UseG1GC ARG USER_ID ENV USER_ID ${USER_ID:-1001} -ARG GROUP_ID +ARG GROUP_ID ENV GROUP_ID ${GROUP_ID:-1001} # Install sbt diff --git a/openjdk-oracle/Dockerfile b/openjdk-oracle/Dockerfile index a52af4b..2148e78 100644 --- a/openjdk-oracle/Dockerfile +++ b/openjdk-oracle/Dockerfile @@ -10,12 +10,12 @@ FROM openjdk:${BASE_IMAGE_TAG:-11.0.16-jdk-oraclelinux8} # Env variables ARG SCALA_VERSION -ENV SCALA_VERSION ${SCALA_VERSION:-2.13.8} +ENV SCALA_VERSION ${SCALA_VERSION:-2.13.9} ARG SBT_VERSION ENV SBT_VERSION ${SBT_VERSION:-1.6.2} ARG USER_ID ENV USER_ID ${USER_ID:-1001} -ARG GROUP_ID +ARG GROUP_ID ENV GROUP_ID ${GROUP_ID:-1001} # Install sbt @@ -48,7 +48,7 @@ RUN groupadd --gid $GROUP_ID sbtuser && useradd --gid $GROUP_ID --uid $USER_ID s USER sbtuser # Switch working directory -WORKDIR /home/sbtuser +WORKDIR /home/sbtuser # Prepare sbt (warm cache) RUN \ @@ -74,6 +74,6 @@ RUN \ ## Users wanting to use this container as non-root should combine the two following arguments ## -u sbtuser ## -w /home/sbtuser -WORKDIR /root +WORKDIR /root CMD sbt diff --git a/openjdk/Dockerfile b/openjdk/Dockerfile index cef2ea2..b0b731e 100644 --- a/openjdk/Dockerfile +++ b/openjdk/Dockerfile @@ -10,12 +10,12 @@ FROM openjdk:${BASE_IMAGE_TAG:-8u342-jdk-bullseye} # Env variables ARG SCALA_VERSION -ENV SCALA_VERSION ${SCALA_VERSION:-2.13.8} +ENV SCALA_VERSION ${SCALA_VERSION:-2.13.9} ARG SBT_VERSION ENV SBT_VERSION ${SBT_VERSION:-1.6.2} ARG USER_ID ENV USER_ID ${USER_ID:-1001} -ARG GROUP_ID +ARG GROUP_ID ENV GROUP_ID ${GROUP_ID:-1001} # Install sbt @@ -79,6 +79,6 @@ RUN \ ## Users wanting to use this container as non-root should combine the two following arguments ## -u sbtuser ## -w /home/sbtuser -WORKDIR /root +WORKDIR /root CMD sbt