diff --git a/Dockerfile b/Dockerfile index 9ee6149970..4cd8bc07b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # TODO: Replace build script with multi-stage Dockerfile that builds its own JAR -# FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 as jar-builder +# FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 as jar-builder # ...build JAR... # FROM us.gcr.io/broad-dsp-gcr-public/base/jre:17-debian # COPY --from=jar-builder ./rawls*.jar /rawls diff --git a/automation/Dockerfile-tests b/automation/Dockerfile-tests index 745caa6810..5c4176c57e 100644 --- a/automation/Dockerfile-tests +++ b/automation/Dockerfile-tests @@ -1,4 +1,4 @@ -FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 +FROM sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 COPY src /app/src COPY test.sh /app diff --git a/docker/build.sh b/docker/build.sh index bd11e291b4..2323a558f8 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -99,7 +99,7 @@ function make_jar() # TODO: DOCKER_TAG hack until JAR build migrates to Dockerfile. Tell SBT to name the JAR # `rawls-assembly-local-SNAP.jar` instead of including the commit hash. Otherwise we get # an explosion of JARs that all get copied to the image; and which one runs is undefined. - 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.13_11_1.10.6_2.13.15 /working/docker/clean_install.sh /working" + 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.13_11_1.10.7_2.13.15 /working/docker/clean_install.sh /working" JAR_CMD=$($DOCKER_RUN 1>&2) EXIT_CODE=$? @@ -116,7 +116,7 @@ function artifactory_push() ARTIFACTORY_USERNAME=dsdejenkins ARTIFACTORY_PASSWORD=$(docker run -e VAULT_TOKEN=$VAULT_TOKEN broadinstitute/dsde-toolbox vault read -field=password secret/dsp/accts/artifactory/dsdejenkins) echo "Publishing to artifactory..." - docker run --rm -e GIT_HASH=$GIT_HASH -v $PWD:/$PROJECT -v sbt-cache:/root/.sbt -v jar-cache:/root/.ivy2 -v coursier-cache:/root/.cache/coursier -w="/$PROJECT" -e ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME -e ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 /$PROJECT/core/src/bin/publishSnapshot.sh + docker run --rm -e GIT_HASH=$GIT_HASH -v $PWD:/$PROJECT -v sbt-cache:/root/.sbt -v jar-cache:/root/.ivy2 -v coursier-cache:/root/.cache/coursier -w="/$PROJECT" -e ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME -e ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 /$PROJECT/core/src/bin/publishSnapshot.sh } function docker_cmd() diff --git a/docker/build_jar.sh b/docker/build_jar.sh index e862cd3d31..51a9f48ef7 100755 --- a/docker/build_jar.sh +++ b/docker/build_jar.sh @@ -6,7 +6,7 @@ set -e # make jar. cache sbt dependencies. capture output and stop db before returning. -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.13_11_1.10.6_2.13.15 /working/docker/clean_install.sh /working +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.13_11_1.10.7_2.13.15 /working/docker/clean_install.sh /working EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/local-dev/templates/docker-rsync-local-rawls.sh b/local-dev/templates/docker-rsync-local-rawls.sh index b23db20e01..268c3652ee 100755 --- a/local-dev/templates/docker-rsync-local-rawls.sh +++ b/local-dev/templates/docker-rsync-local-rawls.sh @@ -96,7 +96,7 @@ start_server () { -e JAVA_OPTS="$JAVA_OPTS" \ -e GOOGLE_APPLICATION_CREDENTIALS='/etc/rawls-account.json' \ -e GIT_HASH=$GIT_HASH \ - sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.6_2.13.15 \ + sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 \ bash -c "git config --global --add safe.directory /app && sbt clean \~reStart" docker cp config/rawls-account.pem rawls-sbt:/etc/rawls-account.pem