From 115f843032ae2b26d5ee39f746023be3acfdaf20 Mon Sep 17 00:00:00 2001 From: sergiorussia <22471371+sergiorussia@users.noreply.github.com> Date: Wed, 25 Sep 2019 00:07:14 +0300 Subject: [PATCH] sbt 1.3.2, scala 2.13.1 --- image-amazon/Dockerfile | 2 +- image-debian/Dockerfile | 2 +- image-openjdk/Dockerfile | 2 +- update.sh | 11 +++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 update.sh diff --git a/image-amazon/Dockerfile b/image-amazon/Dockerfile index 15b4992..6ff4ad3 100644 --- a/image-amazon/Dockerfile +++ b/image-amazon/Dockerfile @@ -2,7 +2,7 @@ FROM amazoncorretto:8u222 # The following is inspired by https://github.com/hseeberger/scala-sbt/blob/master/oracle/Dockerfile -ENV SBT_VERSION 1.3.0 +ENV SBT_VERSION 1.3.2 RUN \ curl -L -o /root/sbt-${SBT_VERSION}.rpm https://bintray.com/sbt/rpm/download_file?file_path=sbt-${SBT_VERSION}.rpm && \ yum install -y /root/sbt-${SBT_VERSION}.rpm && \ diff --git a/image-debian/Dockerfile b/image-debian/Dockerfile index b64f592..a0a5927 100644 --- a/image-debian/Dockerfile +++ b/image-debian/Dockerfile @@ -5,7 +5,7 @@ FROM buildpack-deps:stretch-scm RUN apt-get update && apt-get install -y --no-install-recommends openjdk-8-jdk openjfx && rm -rf /var/lib/apt/lists/* # The following is inspired by https://github.com/hseeberger/scala-sbt/blob/master/debian/Dockerfile -ENV SBT_VERSION 1.3.0 +ENV SBT_VERSION 1.3.2 RUN \ curl -L -o /root/sbt-${SBT_VERSION}.deb https://dl.bintray.com/sbt/debian/sbt-${SBT_VERSION}.deb && \ apt-get install -y /root/sbt-${SBT_VERSION}.deb && \ diff --git a/image-openjdk/Dockerfile b/image-openjdk/Dockerfile index a8e1935..e69757f 100644 --- a/image-openjdk/Dockerfile +++ b/image-openjdk/Dockerfile @@ -5,7 +5,7 @@ FROM openjdk:8u222-jdk-stretch RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* # The following is inspired by https://github.com/hseeberger/scala-sbt/blob/master/debian/Dockerfile -ENV SBT_VERSION 1.3.0 +ENV SBT_VERSION 1.3.2 RUN \ curl -L -o /root/sbt-${SBT_VERSION}.deb https://dl.bintray.com/sbt/debian/sbt-${SBT_VERSION}.deb && \ apt-get install -y /root/sbt-${SBT_VERSION}.deb && \ diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..c549dcd --- /dev/null +++ b/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# Usage: $0 + +# https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/ +set -Eeuo pipefail + +version_sbt="$1" +version_scala="$2" +root="$( cd "$( dirname "$0" )" && pwd )" +cd "$root/" +sed -i -e "s|^ENV SBT_VERSION.*|ENV SBT_VERSION $version_sbt|" -e "s|^ENV SCALA_VERSION.*|ENV SCALA_VERSION $version_scala|" image-*/Dockerfile