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.

Sign up for GitHub

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

Jump to bottom

Authorize to GAR in init scripts #4782

Merged
merged 11 commits into from
Oct 2, 2024
Merged

Authorize to GAR in init scripts #4782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8628335
Authorize to GAR in init scripts
lucymcnatt Sep 10, 2024
94859a7
use gcloud command
lucymcnatt Sep 10, 2024
7042162
Merge branch 'develop' into IA-4518-gcr-gar
lucymcnatt Sep 10, 2024
220f84f
udpating documentation
lucymcnatt Sep 11, 2024
d20f10a
Merge branch 'IA-4518-gcr-gar' of https://github.com/DataBiosphere/le…
lucymcnatt Sep 11, 2024
9da00ac
configure docker with location
lucymcnatt Sep 11, 2024
1bd5dd7
us.gcr.io is public, gcr.io is private
lucymcnatt Sep 19, 2024
2ef35a4
Merge branch 'develop' into IA-4518-gcr-gar
lucymcnatt Sep 23, 2024
af856a4
merge conflicts
lucymcnatt Sep 23, 2024
f74d2d1
if docker pull fails, use cryptopants docker compose
lucymcnatt Sep 26, 2024
87ddd6c
revert change
lucymcnatt Sep 27, 2024
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
18 changes: 9 additions & 9 deletions http/src/main/resources/init-resources/gce-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,7 @@ START_TIME=$(date +%s)
STEP_TIMINGS=($(date +%s))


# Use specific docker compose command if the container is coming from GCR, see https://hub.docker.com/r/cryptopants/docker-compose-gcr
# TODO - Also check for GAR see https://broadworkbench.atlassian.net/browse/IA-4518
if grep -qF "gcr.io" <<< "${JUPYTER_DOCKER_IMAGE}${RSTUDIO_DOCKER_IMAGE}${PROXY_DOCKER_IMAGE}${WELDER_DOCKER_IMAGE}" ; then
log 'Authorizing GCR...'
DOCKER_COMPOSE="docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /var:/var -w=/var cryptopants/docker-compose-gcr"
else
DOCKER_COMPOSE="docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /var:/var docker/compose:1.29.2"
fi
DOCKER_COMPOSE="docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /var:/var docker/compose:1.29.2"

mkdir -p ${WORK_DIRECTORY}
mkdir -p ${CERT_DIRECTORY}
Expand Down Expand Up @@ -381,7 +374,14 @@ docker network create -d bridge app_network
${DOCKER_COMPOSE} --env-file=/var/variables.env "${COMPOSE_FILES[@]}" config

# Docker Pull
retry 5 ${DOCKER_COMPOSE} --env-file=/var/variables.env "${COMPOSE_FILES[@]}" pull &> /var/docker_pull_output.txt
log 'Pulling docker images...'
if ! retry 5 ${DOCKER_COMPOSE} --env-file=/var/variables.env "${COMPOSE_FILES[@]}" pull &> /var/docker_pull_output.txt; then
# if coming from a private repo on GCR, need to use credentials supplied in cryptopants/docker-compose-gcr
# (see https://hub.docker.com/r/cryptopants/docker-compose-gcr)
log 'Docker pull failed. Private image, trying with cryptopants/docker-compose-gcr...'
DOCKER_COMPOSE="docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /var:/var -w=/var cryptopants/docker-compose-gcr"
retry 5 ${DOCKER_COMPOSE} --env-file=/var/variables.env "${COMPOSE_FILES[@]}" pull &> /var/docker_pull_output.txt;
fi

# This needs to happen before we start up containers because the jupyter user needs to be the owner of the PD
chmod a+rwx ${WORK_DIRECTORY}
Expand Down
6 changes: 3 additions & 3 deletions http/src/main/resources/init-resources/init-actions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,11 @@ END
fi


# If any image is hosted in a GCR registry (detected by regex) then
# If any image is hosted in a GAR registry (detected by regex) then
# authorize docker to interact with gcr.io.
# TODO - Also check for GAR see https://broadworkbench.atlassian.net/browse/IA-4518
# NOTE: GCR images are now hosted on GAR, but the file paths haven't changed, they automatically redirect.
if grep -qF "gcr.io" <<< "${JUPYTER_DOCKER_IMAGE}${RSTUDIO_DOCKER_IMAGE}${PROXY_DOCKER_IMAGE}${WELDER_DOCKER_IMAGE}" ; then
log 'Authorizing GCR...'
log 'Authorizing GCR/GAR...'
gcloud auth configure-docker
fi

Expand Down
Loading