Skip to content

Commit d8781da

Browse files
committed
fix merge
1 parent da80174 commit d8781da

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

amazoncorretto/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ RUN \
4747
"3"*) echo 'import java.io.FileInputStream;import java.util.jar.JarInputStream;val scala3LibJar = classOf[CanEqual[_, _]].getProtectionDomain.getCodeSource.getLocation.toURI.getPath;val manifest = new JarInputStream(new FileInputStream(scala3LibJar)).getManifest;val ver = manifest.getMainAttributes.getValue("Implementation-Version");@main def main = println(s"Scala version ${ver}")' > /test/test.scala ;; \
4848
*) echo "println(util.Properties.versionMsg)" > /test/test.scala ;; \
4949
esac && \
50-
scala -nocompdaemon test.scala && rm test.scala
5150
scala -nocompdaemon test/test.scala && \
5251
rm -fr test
5352

@@ -76,6 +75,7 @@ RUN \
7675
# This allows users of this container to choose, whether they want to run the container as sbtuser (non-root) or as root
7776
USER root
7877
RUN \
78+
rm -rf /tmp/..?* /tmp/.[!.]* * && \
7979
ln -s /home/sbtuser/.cache /root/.cache && \
8080
ln -s /home/sbtuser/.sbt /root/.sbt && \
8181
if [ -d "/home/sbtuser/.ivy2" ]; then ln -s /home/sbtuser/.ivy2 /root/.ivy2; fi

0 commit comments

Comments
 (0)