File tree Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 11# TODO: Replace build script with multi-stage Dockerfile that builds its own JAR
2- # FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.17 as jar-builder
2+ # FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.18 as jar-builder
33# ...build JAR...
44# FROM us.gcr.io/broad-dsp-gcr-public/base/jre:17-debian
55# COPY --from=jar-builder ./rawls*.jar /rawls
Original file line number Diff line number Diff line change 1- FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.17
1+ FROM sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.18
22
33COPY src /app/src
44COPY test.sh /app
Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ function make_jar()
9494 # TODO: DOCKER_TAG hack until JAR build migrates to Dockerfile. Tell SBT to name the JAR
9595 # `rawls-assembly-local-SNAP.jar` instead of including the commit hash. Otherwise we get
9696 # an explosion of JARs that all get copied to the image; and which one runs is undefined.
97- DOCKER_RUN=" $DOCKER_RUN -e DOCKER_TAG=local -e GIT_COMMIT -e BUILD_NUMBER -v $PWD :/working -v sbt-cache:/root/.sbt -v jar-cache:/root/.ivy2 -v coursier-cache:/root/.cache/coursier sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.17 /working/docker/clean_install.sh /working"
97+ DOCKER_RUN=" $DOCKER_RUN -e DOCKER_TAG=local -e GIT_COMMIT -e BUILD_NUMBER -v $PWD :/working -v sbt-cache:/root/.sbt -v jar-cache:/root/.ivy2 -v coursier-cache:/root/.cache/coursier sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.18 /working/docker/clean_install.sh /working"
9898
9999 JAR_CMD=$( $DOCKER_RUN 1>&2 )
100100 EXIT_CODE=$?
Original file line number Diff line number Diff line change 66set -e
77
88# make jar. cache sbt dependencies. capture output and stop db before returning.
9- docker run --rm -e DOCKER_TAG -e GIT_COMMIT -e BUILD_NUMBER -v $PWD :/working -v sbt-cache:/root/.sbt -v jar-cache:/root/.ivy2 -v coursier-cache:/root/.cache/coursier sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.17 /working/docker/clean_install.sh /working
9+ docker run --rm -e DOCKER_TAG -e GIT_COMMIT -e BUILD_NUMBER -v $PWD :/working -v sbt-cache:/root/.sbt -v jar-cache:/root/.ivy2 -v coursier-cache:/root/.cache/coursier sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.18 /working/docker/clean_install.sh /working
1010EXIT_CODE=$?
1111
1212if [ $EXIT_CODE != 0 ]; then
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ start_server () {
9797 -e GOOGLE_APPLICATION_CREDENTIALS=' /etc/rawls-account.json' \
9898 -e GIT_HASH=$GIT_HASH \
9999 -e RAWLS_LOG_APPENDER=Console-Standard \
100- sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.17 \
100+ sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.18 \
101101 bash -c " git config --global --add safe.directory /app && sbt clean \~reStart"
102102
103103 docker cp config/rawls-account.pem rawls-sbt:/etc/rawls-account.pem
You can’t perform that action at this time.
0 commit comments