Skip to content

Commit

Permalink
sbt 1.3.2, scala 2.13.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiorussia committed Sep 24, 2019
1 parent 37e7fa5 commit 115f843
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion image-amazon/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion image-debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion image-openjdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
11 changes: 11 additions & 0 deletions update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
# Usage: $0 <sbt-version> <scala-version>

# 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

0 comments on commit 115f843

Please sign in to comment.