From a6b113ac31dcc86b98bc446317178e0807bb53a5 Mon Sep 17 00:00:00 2001 From: Ivan Chvets Date: Wed, 25 Jan 2023 20:52:31 -0500 Subject: [PATCH] fix: updated oci images https://github.com/canonical/notebook-operators/issues/109 Summary of changes: - Updated OCI images to point to re-built images in dockerhub. - Updated publish.sh to publish only limited list of images. --- charms/jupyter-controller/metadata.yaml | 2 +- charms/jupyter-ui/metadata.yaml | 2 +- charms/jupyter-ui/requirements.in | 2 +- charms/jupyter-ui/requirements.txt | 2 +- image-definitions/publish.sh | 12 +++++++----- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/charms/jupyter-controller/metadata.yaml b/charms/jupyter-controller/metadata.yaml index b5d8e363..0dfd58b6 100644 --- a/charms/jupyter-controller/metadata.yaml +++ b/charms/jupyter-controller/metadata.yaml @@ -7,7 +7,7 @@ resources: oci-image: type: oci-image description: 'Backing OCI image' - upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.6.1 + upstream-source: registry.hub.docker.com/charmedkubeflow/notebook-controller:v1.6.1 deployment: type: stateless service: omit diff --git a/charms/jupyter-ui/metadata.yaml b/charms/jupyter-ui/metadata.yaml index 57a579a1..16606cde 100644 --- a/charms/jupyter-ui/metadata.yaml +++ b/charms/jupyter-ui/metadata.yaml @@ -8,7 +8,7 @@ resources: oci-image: type: oci-image description: 'Backing OCI image' - upstream-source: docker.io/kubeflownotebookswg/jupyter-web-app:v1.6.1 + upstream-source: registry.hub.docker.com/charmedkubeflow/jupyter-web-app:v1.6.1 requires: ingress: interface: ingress diff --git a/charms/jupyter-ui/requirements.in b/charms/jupyter-ui/requirements.in index fdee1f06..b04d6daa 100644 --- a/charms/jupyter-ui/requirements.in +++ b/charms/jupyter-ui/requirements.in @@ -1,7 +1,7 @@ ops oci-image charmed-kubeflow-chisme -lightkube-models==1.26.0.4 +lightkube-models==1.25.4.4 pyyaml serialized-data-interface<0.4 # Unittest will fail without pinning diff --git a/charms/jupyter-ui/requirements.txt b/charms/jupyter-ui/requirements.txt index 825f7158..57987cb8 100644 --- a/charms/jupyter-ui/requirements.txt +++ b/charms/jupyter-ui/requirements.txt @@ -36,7 +36,7 @@ jsonschema==3.2.0 # via serialized-data-interface lightkube==0.12.0 # via charmed-kubeflow-chisme -lightkube-models==1.26.0.4 +lightkube-models==1.25.4.4 # via # -r requirements.in # lightkube diff --git a/image-definitions/publish.sh b/image-definitions/publish.sh index b586a8f8..ff7a1770 100755 --- a/image-definitions/publish.sh +++ b/image-definitions/publish.sh @@ -26,11 +26,13 @@ echo "Tag: $TAG" #IMAGE_LIST=($(docker image ls *:$TAG --format="{{.Repository}}:{{.Tag}}")) # selected images that need to be published IMAGE_LIST=( -"jupyter-scipy:v1.6.1" -"jupyter-pytorch-full:v1.6.1" -"jupyter-pytorch-cuda-full:v1.6.1" -"jupyter-tensorflow-full:v1.6.1" -"jupyter-tensorflow-cuda-full:v1.6.1" +"jupyter-scipy:$TAG" +"jupyter-pytorch-full:$TAG" +"jupyter-pytorch-cuda-full:$TAG" +"jupyter-tensorflow-full:$TAG" +"jupyter-tensorflow-cuda-full:$TAG" +"notebook-controller:$TAG" +"jupyter-web-app:$TAG" ) echo $IMAGE_LIST