diff --git a/awsconfigs/apps/jupyter-web-app/configs/spawner_ui_config.yaml b/awsconfigs/apps/jupyter-web-app/configs/spawner_ui_config.yaml index b7365094f2..9677a5c09b 100644 --- a/awsconfigs/apps/jupyter-web-app/configs/spawner_ui_config.yaml +++ b/awsconfigs/apps/jupyter-web-app/configs/spawner_ui_config.yaml @@ -17,14 +17,14 @@ spawnerFormDefaults: image: # The container Image for the user's Jupyter Notebook - value: public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20 + value: public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1 # The list of available standard container Images options: - kubeflownotebookswg/jupyter-scipy:v1.6.1 - - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2-2022-09-20 - - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20 - - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2-2022-09-20 - - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2-2022-09-20 + - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-gpu-py39-cu112-ubuntu20.04-ec2-v1.1 + - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1 + - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-gpu-py38-cu116-ubuntu20.04-ec2-v1.2 + - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-cpu-py38-ubuntu20.04-ec2-v1.2 imageGroupOne: # The container Image for the user's Group One Server # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /` diff --git a/charts/apps/jupyter-web-app/templates/ConfigMap/jupyter-web-app-config-tgcbb2gdkd-kubeflow-ConfigMap.yaml b/charts/apps/jupyter-web-app/templates/ConfigMap/jupyter-web-app-config-tgcbb2gdkd-kubeflow-ConfigMap.yaml index ed6cf1f4f0..7197ceae5f 100644 --- a/charts/apps/jupyter-web-app/templates/ConfigMap/jupyter-web-app-config-tgcbb2gdkd-kubeflow-ConfigMap.yaml +++ b/charts/apps/jupyter-web-app/templates/ConfigMap/jupyter-web-app-config-tgcbb2gdkd-kubeflow-ConfigMap.yaml @@ -11,12 +11,12 @@ data: \ be available for users to edit.\n#\n# Note that some values can be templated.\ \ Such values are the names of the\n# Volumes as well as their StorageClass\n\ spawnerFormDefaults:\n image:\n # The container Image for the user's Jupyter\ - \ Notebook\n value: public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20\n\ + \ Notebook\n value: public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1\n\ \ # The list of available standard container Images\n options:\n - kubeflownotebookswg/jupyter-scipy:v1.6.1\n\ - \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2-2022-09-20\n\ - \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20\n\ - \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2-2022-09-20\n\ - \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2-2022-09-20\n\ + \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-gpu-py39-cu112-ubuntu20.04-ec2-v1.1\n\ + \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1\n\ + \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-gpu-py38-cu116-ubuntu20.04-ec2-v1.2\n\ + \ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-cpu-py38-ubuntu20.04-ec2-v1.2\n\ \ imageGroupOne:\n # The container Image for the user's Group One Server\n\ \ # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`\n # is applied\ \ to notebook in this group, configuring\n # the Istio rewrite for containers\ diff --git a/components/notebook-dockerfiles/README.md b/components/notebook-dockerfiles/README.md index 139dea574f..e430007822 100644 --- a/components/notebook-dockerfiles/README.md +++ b/components/notebook-dockerfiles/README.md @@ -7,10 +7,10 @@ This directory contains the source code for these jupyter images which is based The following AWS Optimized container images are available from the [Amazon Elastic Container Registry](https://gallery.ecr.aws/kubeflow-on-aws/) (Amazon ECR). ``` -public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2-2022-09-20 -public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20 -public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2-2022-09-20 -public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2-2022-09-20 +public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-gpu-py39-cu112-ubuntu20.04-ec2-v1.1 +public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1 +public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-gpu-py38-cu116-ubuntu20.04-ec2-v1.2 +public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-cpu-py38-ubuntu20.04-ec2-v1.2 ``` These images are based on AWS Deep Learning Containers which provide optimized environments with popular machine learning frameworks such as TensorFlow and PyTorch, and are available in the Amazon ECR. For more information on AWS Deep Learning Container options, see [Deep Learning Container Docs](https://docs.aws.amazon.com/deep-learning-containers/latest/devguide/what-is-dlc.html). diff --git a/components/notebook-dockerfiles/pytorch/cpu.Dockerfile b/components/notebook-dockerfiles/pytorch/cpu.Dockerfile index 4e8dd4a2f7..70a5feaab5 100644 --- a/components/notebook-dockerfiles/pytorch/cpu.Dockerfile +++ b/components/notebook-dockerfiles/pytorch/cpu.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.12.0-cpu-py38-ubuntu20.04-ec2 +ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.12.1-cpu-py38-ubuntu20.04-ec2-v1.2 FROM $BASE_IMAGE ARG NB_USER=jovyan diff --git a/components/notebook-dockerfiles/pytorch/cuda.Dockerfile b/components/notebook-dockerfiles/pytorch/cuda.Dockerfile index 9187c1781b..6a3f4ab855 100644 --- a/components/notebook-dockerfiles/pytorch/cuda.Dockerfile +++ b/components/notebook-dockerfiles/pytorch/cuda.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2 +ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/pytorch-training:1.12.1-gpu-py38-cu116-ubuntu20.04-ec2-v1.2 FROM $BASE_IMAGE diff --git a/components/notebook-dockerfiles/tensorflow/cpu.Dockerfile b/components/notebook-dockerfiles/tensorflow/cpu.Dockerfile index fa56e752e7..77358677f9 100644 --- a/components/notebook-dockerfiles/tensorflow/cpu.Dockerfile +++ b/components/notebook-dockerfiles/tensorflow/cpu.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2 +ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1 FROM $BASE_IMAGE diff --git a/components/notebook-dockerfiles/tensorflow/cuda.Dockerfile b/components/notebook-dockerfiles/tensorflow/cuda.Dockerfile index f0d858cd4e..318263dc96 100644 --- a/components/notebook-dockerfiles/tensorflow/cuda.Dockerfile +++ b/components/notebook-dockerfiles/tensorflow/cuda.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2 +ARG BASE_IMAGE=763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:2.10.0-gpu-py39-cu112-ubuntu20.04-ec2-v1.1 FROM $BASE_IMAGE diff --git a/tests/e2e/tests/test_notebook_images.py b/tests/e2e/tests/test_notebook_images.py index cce37759f8..dbaeba51ea 100644 --- a/tests/e2e/tests/test_notebook_images.py +++ b/tests/e2e/tests/test_notebook_images.py @@ -24,27 +24,27 @@ NOTEBOOK_IMAGES = [ "kubeflownotebookswg/jupyter-scipy:v1.6.1", - "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2-2022-09-20", - "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20", - "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2-2022-09-20", - "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2-2022-09-20", + "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-gpu-py39-cu112-ubuntu20.04-ec2-v1.1", + "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.10.0-cpu-py39-ubuntu20.04-ec2-v1.1", + "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-gpu-py38-cu116-ubuntu20.04-ec2-v1.2", + "public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.1-cpu-py38-ubuntu20.04-ec2-v1.2", ] testdata = [ ("scipy", NOTEBOOK_IMAGES[0], "sanity_check.ipynb", "Hello World!"), - ("tf-gpu", NOTEBOOK_IMAGES[1], "verify_tensorflow_installation.ipynb", "2.9.1"), - ("tf-cpu", NOTEBOOK_IMAGES[2], "verify_tensorflow_installation.ipynb", "2.9.1"), + ("tf-gpu", NOTEBOOK_IMAGES[1], "verify_tensorflow_installation.ipynb", "2.10.0"), + ("tf-cpu", NOTEBOOK_IMAGES[2], "verify_tensorflow_installation.ipynb", "2.10.0"), ( "pytorch-gpu", NOTEBOOK_IMAGES[3], "verify_pytorch_installation.ipynb", - "1.12.0+cu116", + "1.12.1+cu116", ), ( "pytorch-cpu", NOTEBOOK_IMAGES[4], "verify_pytorch_installation.ipynb", - "1.12.0+cpu", + "1.12.1+cpu", ), ]