Skip to content

use latest image for workbench custom image #280

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

Merged
yuhuyoyo merged 1 commit into from
Dec 12, 2025
Merged

use latest image for workbench custom image #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions feature-versions/state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,23 @@
"filter": ".*\\/\\.devcontainer\\.json"
},
"us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper": {
"tag": "ov-prod",
"installed": "sha256:fe7a28feff1b12572d840040fadf1ed7fe36cc1aba56a2534a1bcb064e3ef3ae",
"tag": "latest",
"installed": "sha256:d38359cfdeea311088563bc847d53870da1fd122dc86dd326ecc2c45210eae03",
"filter": ".*\\/docker-compose.yaml"
},
"us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-jupyter-extension-builder": {
"tag": "ov-prod",
"installed": "sha256:ef01de1196e46c30baff12857e0a1cdda212271e7548bb56512dc4bf94bca88a",
"tag": "latest",
"installed": "sha256:d91b0fe5b7864b4a79a5a4bdddf4475de71c5e5dfa6f03827edb5e426bc7a455",
"filter": ".*\\/Dockerfile"
},
"us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-aou-jupyter": {
"tag": "ov-prod",
"installed": "sha256:259d1a03e480e64846a9f8c76bf0821be04ee91816b0b4227886aa543255d038",
"tag": "latest",
"installed": "sha256:6ffe5bc68b0b247f5f8b3b2e6211a64f98dfea1db39b54711385c3aebc6f8720",
"filter": ".*\\/Dockerfile"
},
"us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-workbench-jupyter": {
"tag": "latest",
"installed": "sha256:8261521e5433b6997c4b323c4b391b02ea3fc3f059e33ccedc36af2554ef70f9",
"filter": ".*\\/Dockerfile"
}
}
2 changes: 1 addition & 1 deletion src/aou-common/extension-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-jupyter-extension-builder@sha256:ef01de1196e46c30baff12857e0a1cdda212271e7548bb56512dc4bf94bca88a
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-jupyter-extension-builder@sha256:d91b0fe5b7864b4a79a5a4bdddf4475de71c5e5dfa6f03827edb5e426bc7a455

COPY extension /extension

Expand Down
3 changes: 1 addition & 2 deletions src/custom-workbench-jupyter-template/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG CONTAINER_IMAGE=debian:bullseye
FROM $CONTAINER_IMAGE
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-workbench-jupyter@sha256:8261521e5433b6997c4b323c4b391b02ea3fc3f059e33ccedc36af2554ef70f9

# Install jupyter extensions
RUN --mount=type=bind,from=jupyter-extension-builder,source=/dist,target=/tmp/extensions \
Expand Down
10 changes: 0 additions & 10 deletions src/custom-workbench-jupyter-template/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@
"description": "Whether to log in to workbench CLI",
"proposals": ["true", "false"],
"default": "false"
},
"containerImage": {
"type": "string",
"description": "The container image to use",
"default": "debian:bullseye"
},
"containerPort": {
"type": "number",
"description": "The port to expose the container on",
"default": 8888
}
},
"platforms": ["Any"]
Expand Down
4 changes: 1 addition & 3 deletions src/custom-workbench-jupyter-template/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@ services:
container_name: "application-server"
build:
context: .
args:
CONTAINER_IMAGE: "${templateOption:containerImage}"
additional_contexts:
jupyter-extension-builder: service:jupyter-common-extension-builder
user: "jupyter"
restart: always
volumes:
- .:/workspace:cached
ports:
- "${templateOption:containerPort}:${templateOption:containerPort}"
- "8888:8888"
networks:
- app-network
cap_add:
Expand Down
2 changes: 1 addition & 1 deletion src/jupyter-aou/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-aou-jupyter@sha256:259d1a03e480e64846a9f8c76bf0821be04ee91816b0b4227886aa543255d038
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-aou-jupyter@sha256:6ffe5bc68b0b247f5f8b3b2e6211a64f98dfea1db39b54711385c3aebc6f8720

# Install jupyter extensions
RUN --mount=type=bind,from=jupyter-extension-builder,source=/dist,target=/tmp/extensions \
Expand Down
2 changes: 1 addition & 1 deletion src/jupyter-aou/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
# TODO(PHP-87353): Add remotefuse back. See https://github.com/verily-src/workbench-app-devcontainers/pull/227
wondershaper:
container_name: "wondershaper"
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:fe7a28feff1b12572d840040fadf1ed7fe36cc1aba56a2534a1bcb064e3ef3ae"
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:d38359cfdeea311088563bc847d53870da1fd122dc86dd326ecc2c45210eae03"
restart: always
network_mode: "host"
cap_add:
Expand Down
2 changes: 1 addition & 1 deletion src/jupyter-common/extension-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-jupyter-extension-builder@sha256:23965ccff02571b4d38c4b0638b44b5b19bc7553b198da1bf37efdf56b08d729
FROM us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-jupyter-extension-builder@sha256:d91b0fe5b7864b4a79a5a4bdddf4475de71c5e5dfa6f03827edb5e426bc7a455

COPY extension /extension

Expand Down
2 changes: 1 addition & 1 deletion src/nemo_jupyter_aou/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
command: jupyter lab --ip=0.0.0.0 --port=8888 --no-browser --LabApp.token=''
wondershaper:
container_name: "wondershaper"
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:fe7a28feff1b12572d840040fadf1ed7fe36cc1aba56a2534a1bcb064e3ef3ae"
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:d38359cfdeea311088563bc847d53870da1fd122dc86dd326ecc2c45210eae03"
restart: always
network_mode: "host"
cap_add:
Expand Down
2 changes: 1 addition & 1 deletion src/workbench-jupyter-parabricks-aou/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
command: ["jupyter", "lab", "--ip=0.0.0.0", "--port=8888", "--no-browser", "--LabApp.token=''"]
wondershaper:
container_name: "wondershaper"
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:fe7a28feff1b12572d840040fadf1ed7fe36cc1aba56a2534a1bcb064e3ef3ae"
image: "us-west2-docker.pkg.dev/shared-pub-buckets-94mvrf/workbench-artifacts/app-wondershaper@sha256:d38359cfdeea311088563bc847d53870da1fd122dc86dd326ecc2c45210eae03"
restart: always
network_mode: "host"
cap_add:
Expand Down