From 37e7fa5c69c9af617d23d8af9619621edb57a737 Mon Sep 17 00:00:00 2001
From: sergiorussia <22471371+sergiorussia@users.noreply.github.com>
Date: Thu, 19 Sep 2019 00:15:48 +0300
Subject: [PATCH] avoid sbt rebuilding if just scala upgrades

---
 image-amazon/Dockerfile  | 2 +-
 image-debian/Dockerfile  | 2 +-
 image-openjdk/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image-amazon/Dockerfile b/image-amazon/Dockerfile
index 9b5bfdf..15b4992 100644
--- a/image-amazon/Dockerfile
+++ b/image-amazon/Dockerfile
@@ -2,7 +2,6 @@
 FROM amazoncorretto:8u222
 
 # The following is inspired by https://github.com/hseeberger/scala-sbt/blob/master/oracle/Dockerfile
-ENV SCALA_VERSION 2.13.1
 ENV SBT_VERSION 1.3.0
 RUN \
   curl -L -o /root/sbt-${SBT_VERSION}.rpm https://bintray.com/sbt/rpm/download_file?file_path=sbt-${SBT_VERSION}.rpm && \
@@ -11,6 +10,7 @@ RUN \
   rm /root/sbt-${SBT_VERSION}.rpm
 
 # Prepare sbt and Scala, verify compilation including JavaFX classes
+ENV SCALA_VERSION 2.13.1
 WORKDIR /root/dummy
 RUN \
   mkdir -p project && \
diff --git a/image-debian/Dockerfile b/image-debian/Dockerfile
index fb996e7..b64f592 100644
--- a/image-debian/Dockerfile
+++ b/image-debian/Dockerfile
@@ -5,7 +5,6 @@ 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 SCALA_VERSION 2.13.1
 ENV SBT_VERSION 1.3.0
 RUN \
   curl -L -o /root/sbt-${SBT_VERSION}.deb https://dl.bintray.com/sbt/debian/sbt-${SBT_VERSION}.deb && \
@@ -13,6 +12,7 @@ RUN \
   rm /root/sbt-${SBT_VERSION}.deb
 
 # Prepare sbt and Scala, verify compilation including JavaFX classes
+ENV SCALA_VERSION 2.13.1
 WORKDIR /root/dummy
 RUN \
   mkdir -p project && \
diff --git a/image-openjdk/Dockerfile b/image-openjdk/Dockerfile
index 98edf25..a8e1935 100644
--- a/image-openjdk/Dockerfile
+++ b/image-openjdk/Dockerfile
@@ -5,7 +5,6 @@ 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 SCALA_VERSION 2.13.0
 ENV SBT_VERSION 1.3.0
 RUN \
   curl -L -o /root/sbt-${SBT_VERSION}.deb https://dl.bintray.com/sbt/debian/sbt-${SBT_VERSION}.deb && \
@@ -18,6 +17,7 @@ RUN \
   ln -s -t "$JAVA_HOME/jre/lib/ext/" $(find /usr/share/java/openjfx/jre/lib/ext/ -maxdepth 1 -type f)
 
 # Prepare sbt and Scala, verify compilation including JavaFX classes
+ENV SCALA_VERSION 2.13.1
 WORKDIR /root/dummy
 RUN \
   mkdir -p project && \