Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
kijuky committed Nov 14, 2024
1 parent da80174 commit d8781da
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion amazoncorretto/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ RUN \
"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 ;; \
*) echo "println(util.Properties.versionMsg)" > /test/test.scala ;; \
esac && \
scala -nocompdaemon test.scala && rm test.scala
scala -nocompdaemon test/test.scala && \
rm -fr test

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

0 comments on commit d8781da

Please sign in to comment.