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

[RW-12298] upgrade AoU docker images #4490

Closed
wants to merge 15 commits into from
Closed

[RW-12298] upgrade AoU docker images #4490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
24dfd11
upgrade aou
yonghaoy Apr 30, 2024
47c5fae
old is 2.2.7
yonghaoy Apr 30, 2024
849789b
bump aou image
yonghaoy May 1, 2024
f349ab4
revert unrelated change
yonghaoy May 1, 2024
3e7d7ae
Merge remote-tracking branch 'origin' into yyu-RW-12298
yonghaoy May 1, 2024
0c6dada
revert unrelated change
yonghaoy May 1, 2024
769a3d2
rge remote-tracking branch 'origin' into yyu-RW-12298
yonghaoy May 1, 2024
804aead
Merge remote-tracking branch 'origin' into yyu-RW-12298
yonghaoy May 3, 2024
46828e0
merge
yonghaoy May 3, 2024
0211c47
merge
yonghaoy May 3, 2024
eec8f89
Merge remote-tracking branch 'origin' into yyu-RW-12298
yonghaoy May 3, 2024
2329f14
Merge branch 'develop' into yyu-RW-12298
Qi77Qi May 6, 2024
099217f
Merge remote-tracking branch 'origin' into yyu-RW-12298
yonghaoy May 6, 2024
1807bb7
new gce cache
yonghaoy May 6, 2024
a1c4e02
Merge remote-tracking branch 'origin/yyu-RW-12298' into yyu-RW-12298
yonghaoy May 6, 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
2 changes: 1 addition & 1 deletion automation/src/test/resources/reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ leonardo {
pythonImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5"
hailImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.10"
gatkImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.6"
aouImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.8"
aouImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.9"
baseImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3"
gcrWelderUri = "us.gcr.io/broad-dsp-gcr-public/welder-server"
dockerHubWelderUri = "broadinstitute/welder-server"
Expand Down
4 changes: 2 additions & 2 deletions docker/run-mysql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ start() {
-e MYSQL_DATABASE=leotestdb \
-d \
-p 3311:3306 \
mysql/mysql-server:$MYSQL_VERSION
mariadb:10.2

# validate mysql
echo "running mysql validation..."
docker run --rm \
--link $CONTAINER:mysql \
-v $PWD/docker/sql_validate.sh:/working/sql_validate.sh \
mysql:$MYSQL_VERSION \
mariadb:10.2 \
/working/sql_validate.sh $TARGET

if [ 0 -eq $? ]; then
Expand Down
2 changes: 1 addition & 1 deletion jenkins/dataproc-custom-images/prepare-custom-leonardo-jupyter-dataproc-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ openidc_proxy="broadinstitute/openidc-proxy:2.3.1_2"
anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.18.0"

# Note that this is the version used currently by AOU in production, the one above can be staged for testing
terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.7"
terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.8"

# If you change this you must also change Leo reference.conf!
cryptomining_detector="us.gcr.io/broad-dsp-gcr-public/cryptomining-detector:0.0.2"
Expand Down
4 changes: 2 additions & 2 deletions jenkins/gce-custom-images/prepare_gce_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5"
terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.4"
terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.4"
terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.6"
terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.8"
terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.9"
welder_server="us.gcr.io/broad-dsp-gcr-public/welder-server:8667bfe"
openidc_proxy="broadinstitute/openidc-proxy:2.3.1_2"
anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.18.0"

# Note that this is the version used currently by AOU in production, the one above can be staged for testing
terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.7"
terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.8"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which version we have in prod today? this needs to be what's in prod

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point. it is 2.2.7 now.


cos_gpu_installer="gcr.io/cos-cloud/cos-gpu-installer:v2.1.9"
google_cloud_toolbox="us.gcr.io/cos-cloud/toolbox:v20230714"
Expand Down
Loading