Update the sbt for future new Scala version

parsa-epfl · Sep 12, 2022 · e8787da · e8787da
1 parent a991cf0
commit e8787da
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/benchmarks/graph-analytics/4.0/Dockerfile b/benchmarks/graph-analytics/4.0/Dockerfile
@@ -1,13 +1,16 @@
 FROM --platform=linux/amd64 cloudsuite/spark:2.4.5 as build
 
 # Build the benchmark using sbt
-RUN apt-get update \
-    && apt-get install gnupg curl -y --no-install-recommends \
-    && echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list \
-    && curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add \
+RUN set -ex \
+    && apt-get update \
+    && apt-get install apt-transport-https curl gnupg -y --no-install-recommends \
+    && echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list \
+    && echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list \
+    && curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import \
+    && chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg \
     && apt-get update -y \
-    && apt-get install -y sbt \
-    && rm -rf /var/lib/apt/lists/* 
+    && apt-get install -y --no-install-recommends sbt \
+    && rm -rf /var/lib/apt/lists/*
 
 # Copy files
 COPY benchmark /root/benchmark
@@ -21,7 +24,7 @@ RUN cd /root/benchmark \
 RUN mv /root/benchmark/target/scala-2.11/*.jar /root/benchmark/run_benchmark.sh /benchmarks \
     && rm -r /root/benchmark \
     && apt-get purge -y --auto-remove sbt \
-    && rm -r /root/.sbt /root/.ivy2 \
+    && rm -r /root/.sbt /root/.cache \
     && chmod +x /root/entrypoint.sh
 
 FROM cloudsuitetest/spark:2.4.5

diff --git a/benchmarks/in-memory-analytics/4.0/Dockerfile b/benchmarks/in-memory-analytics/4.0/Dockerfile
@@ -8,19 +8,23 @@ WORKDIR /root
 # Build the benchmark using sbt
 RUN set -ex \
     && apt-get update \
-    && apt-get install -y --no-install-recommends gnupg curl \
-    && echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list \
-    && curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add \
-    && apt-get update -y && apt-get install -y --no-install-recommends sbt \
+    && apt-get install apt-transport-https curl gnupg -y --no-install-recommends \
+    && echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list \
+    && echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list \
+    && curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import \
+    && chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg \
+    && apt-get update -y \
+    && apt-get install -y --no-install-recommends sbt \
     && rm -rf /var/lib/apt/lists/*
 
+
 RUN cd /root/movielens-als \
     && sbt package \
     && mkdir -p /benchmarks/movielens-als \
     && mv /root/movielens-als/target/scala-2.11/*.jar /root/movielens-als/run_benchmark.sh /benchmarks/movielens-als \
     && rm -r /root/movielens-als \
     && apt-get purge -y --auto-remove sbt \
-    && rm -r /root/.sbt /root/.ivy2
+    && rm -r /root/.sbt /root/.cache
 
 COPY files /root/