From 86c4f6a8f893c6c55cefdbfc2cd2428de7684645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= <contact@jdecool.fr>
Date: Sun, 24 Apr 2022 08:39:31 +0200
Subject: [PATCH] Fix scala-sbt-docker image build

---
 scala-sbt-docker/Dockerfile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scala-sbt-docker/Dockerfile b/scala-sbt-docker/Dockerfile
index 0fea38f..a44f36f 100644
--- a/scala-sbt-docker/Dockerfile
+++ b/scala-sbt-docker/Dockerfile
@@ -5,24 +5,22 @@ FROM openjdk:8
 # START COPY FROM https://github.com/hseeberger/scala-sbt/blob/master/Dockerfile
 ###
 
-ENV SCALA_VERSION 2.12.1
-ENV SBT_VERSION 0.13.13
+ENV SCALA_VERSION 2.13.8
+ENV SBT_VERSION 1.6.2
 
 # Install Scala
 ## Piping curl directly in tar
 RUN \
-  curl -fsL http://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \
+  curl -fsL https://downloads.lightbend.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /root/ && \
   echo >> /root/.bashrc && \
   echo 'export PATH=~/scala-$SCALA_VERSION/bin:$PATH' >> /root/.bashrc
 
 # Install sbt
 RUN \
-  curl -L -o sbt-$SBT_VERSION.deb http://dl.bintray.com/sbt/debian/sbt-$SBT_VERSION.deb && \
-  dpkg -i sbt-$SBT_VERSION.deb && \
-  rm sbt-$SBT_VERSION.deb && \
-  apt-get update && \
-  apt-get install sbt && \
-  sbt sbtVersion
+  curl -fsL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | tar xfz - -C /usr/share && \
+  chown -R root:root /usr/share/sbt && \
+  chmod -R 755 /usr/share/sbt && \
+  ln -s /usr/share/sbt/bin/sbt /usr/local/bin/sbt
 
 # Define working directory
 WORKDIR /root