Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE-69: update scala-sbt docker image tag to 1.10.7 #3158

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion automation/Dockerfile-tests
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=$?
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion docker/build_jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion local-dev/templates/docker-rsync-local-rawls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading