Skip to content

Commit c1fbbf0

Browse files
francisdbfrancisdb
committed
revert adjustments for broken scala 3.6.2 as issues have been fixed
1 parent ea87576 commit c1fbbf0

File tree

5 files changed

+15
-25
lines changed

5 files changed

+15
-25
lines changed

‎amazoncorretto/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ RUN \
3535
# Install Scala
3636
RUN \
3737
case $SCALA_VERSION in \
38-
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
39-
3.[0-5]*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
40-
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share/scala-$SCALA_VERSION ;; \
38+
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION ;; \
39+
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION ;; \
4140
esac && \
42-
mkdir -p $EXTRACT_DIR && \
43-
curl -fsL --show-error $URL | tar xfz - -C $EXTRACT_DIR && \
41+
curl -fsL --show-error $URL | tar xfz - -C /usr/share && \
4442
mv $SCALA_DIR /usr/share/scala && \
4543
chown -R root:root /usr/share/scala && \
4644
chmod -R 755 /usr/share/scala && \

‎eclipse-temurin/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ RUN \
3636
# Install Scala
3737
RUN \
3838
case $SCALA_VERSION in \
39-
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
40-
3.[0-5]*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
41-
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share/scala-$SCALA_VERSION ;; \
39+
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION ;; \
40+
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION ;; \
4241
esac && \
43-
mkdir -p $EXTRACT_DIR && \
44-
curl -fsL --show-error $URL | tar xfz - -C $EXTRACT_DIR && \
42+
curl -fsL --show-error $URL | tar xfz - -C /usr/share/ && \
4543
mv $SCALA_DIR /usr/share/scala && \
4644
chown -R root:root /usr/share/scala && \
4745
chmod -R 755 /usr/share/scala && \

‎eclipse-temurin/alpine.Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ RUN apk add --no-cache --virtual=.build-dependencies wget ca-certificates bash c
1515
RUN \
1616
cd "/tmp" && \
1717
case $SCALA_VERSION in \
18-
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
19-
3.[0-5]*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
20-
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share/scala-$SCALA_VERSION ;; \
18+
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION ;; \
19+
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION ;; \
2120
esac && \
22-
mkdir -p $EXTRACT_DIR && \
23-
curl -fsL --show-error $URL | tar xfz - -C $EXTRACT_DIR && \
21+
curl -fsL --show-error $URL | tar xfz - -C /usr/share && \
2422
mv $SCALA_DIR $SCALA_HOME && \
2523
ln -s "$SCALA_HOME/bin/"* "/usr/bin/" && \
2624
update-ca-certificates && \

‎graalvm-ce/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ RUN \
3737
# Install Scala
3838
RUN \
3939
case $SCALA_VERSION in \
40-
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
41-
3.[0-5]*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
42-
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share/scala-$SCALA_VERSION ;; \
40+
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION ;; \
41+
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION ;; \
4342
esac && \
44-
mkdir -p $EXTRACT_DIR && \
45-
curl -fsL --show-error $URL | tar xfz - -C $EXTRACT_DIR && \
43+
curl -fsL --show-error $URL | tar xfz - -C /usr/share && \
4644
mv $SCALA_DIR /usr/share/scala && \
4745
chown -R root:root /usr/share/scala && \
4846
chmod -R 755 /usr/share/scala && \

‎graalvm-community/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ RUN \
3737
# Install Scala
3838
RUN \
3939
case $SCALA_VERSION in \
40-
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
41-
3.[0-5]*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION EXTRACT_DIR=/usr/share ;; \
42-
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala-$SCALA_VERSION EXTRACT_DIR=/usr/share/scala-$SCALA_VERSION ;; \
40+
2.*) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION ;; \
41+
*) URL=https://github.com/scala/scala3/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION ;; \
4342
esac && \
44-
mkdir -p $EXTRACT_DIR && \
45-
curl -fsL --show-error $URL | tar xfz - -C $EXTRACT_DIR && \
43+
curl -fsL --show-error $URL | tar xfz - -C /usr/share && \
4644
mv $SCALA_DIR /usr/share/scala && \
4745
chown -R root:root /usr/share/scala && \
4846
chmod -R 755 /usr/share/scala && \

0 commit comments

Comments
 (0)