Merge pull request #1863 from Esri/JR/notebook-base-image

use updated jupyter base-notebook image
Esri · Jul 9, 2024 · ca9caac · ca9caac
2 parents e60666d + 289de18
commit ca9caac
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/DockerBuild.LambdaBaseImage.yaml b/.github/workflows/DockerBuild.LambdaBaseImage.yaml
@@ -7,7 +7,7 @@ on:
       version:
         description: "Version of ArcGIS API for Python to install in the image"
         type: string
-        default: "2.3.0"
+        default: "2.3.1"
       python_version:
         description: "Python version to base image on"
         type: string
@@ -28,22 +28,22 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Github Packages
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/esri/arcgis-python-api-lambda
@@ -55,7 +55,7 @@ jobs:
 
       - id: docker_build
         name: Build image and push to GitHub Container Registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           # relative path to the place where source code with Dockerfile is located
           context: .

diff --git a/.github/workflows/DockerBuild.NotebookImage.yaml b/.github/workflows/DockerBuild.NotebookImage.yaml
@@ -7,11 +7,11 @@ on:
       version:
         description: "Version of ArcGIS API for Python to install in the image"
         type: string
-        default: "2.2.0"
+        default: "2.3.1"
       python_version:
         description: "Python version to base image on"
         type: string
-        default: "3.9"
+        default: "3.11"
       is_latest_release:
         description: "Version of ArcGIS API for Python is Latest current release"
         type: boolean
@@ -32,18 +32,18 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Github Packages
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/esri/arcgis-python-api-notebook
@@ -55,7 +55,7 @@ jobs:
 
       - id: docker_build
         name: Build image and push to GitHub Container Registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           # relative path to the place where source code with Dockerfile is located
           context: ./docker

diff --git a/docker/LambdaBaseImage.Dockerfile b/docker/LambdaBaseImage.Dockerfile
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.source=https://github.com/esri/arcgis-python-api
 # install dependencies, then clean yum cache
 RUN yum -y install gcc gcc-c++ krb5-devel krb5-server krb5-libs && yum clean all && rm -rf /var/cache/yum
 # install arcgis
-ARG arcgis_version="2.3.0"
+ARG arcgis_version="2.3.1"
 # adding .* ensures the latest patch version is installed
 RUN  pip3 install "arcgis==${arcgis_version}.*" --target "${LAMBDA_TASK_ROOT}" && rm -rf /root/.cache/pip
 # set entrypoint to app.py handler method

diff --git a/docker/NotebookImage.Dockerfile b/docker/NotebookImage.Dockerfile
@@ -1,8 +1,8 @@
-ARG python_version="3.9"
-FROM jupyter/base-notebook:python-${python_version}
+ARG python_version="3.11"
+FROM quay.io/jupyter/base-notebook:python-${python_version}
 
 ARG python_version
-ARG arcgis_version="2.2.0"
+ARG arcgis_version="2.3.1"
 ARG sampleslink="https://github.com/Esri/arcgis-python-api/releases/download/v${arcgis_version}/samples.zip"
 ARG githubfolder="arcgis-python-api"
 ENV DOCKER_STACKS_JUPYTER_CMD="notebook"