From 652c5972bf026d2a0f5667962e487aa1ba58734e Mon Sep 17 00:00:00 2001 From: Jay Roebuck Date: Tue, 9 Jul 2024 14:18:46 -0400 Subject: [PATCH 1/4] use updated jupyter base-notebook image --- docker/NotebookImage.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/NotebookImage.Dockerfile b/docker/NotebookImage.Dockerfile index f2cbfdbd79..9ee44cbe96 100644 --- a/docker/NotebookImage.Dockerfile +++ b/docker/NotebookImage.Dockerfile @@ -1,5 +1,5 @@ ARG python_version="3.9" -FROM jupyter/base-notebook:python-${python_version} +FROM quay.io/jupyter/base-notebook:python-${python_version} ARG python_version ARG arcgis_version="2.2.0" From 3e2bd2965130cbf2d5d126af71ccd2e331577ada Mon Sep 17 00:00:00 2001 From: Jay Roebuck Date: Tue, 9 Jul 2024 14:22:00 -0400 Subject: [PATCH 2/4] updating default versions --- docker/LambdaBaseImage.Dockerfile | 2 +- docker/NotebookImage.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/LambdaBaseImage.Dockerfile b/docker/LambdaBaseImage.Dockerfile index cd2a8ddfb3..d45e050825 100644 --- 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 index 9ee44cbe96..434d65f501 100644 --- a/docker/NotebookImage.Dockerfile +++ b/docker/NotebookImage.Dockerfile @@ -1,8 +1,8 @@ -ARG python_version="3.9" +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" From fe9c72a35080ce3fbfbc0e450fbdc26728af67ad Mon Sep 17 00:00:00 2001 From: Jay Roebuck Date: Tue, 9 Jul 2024 14:34:37 -0400 Subject: [PATCH 3/4] update default versions to current --- .github/workflows/DockerBuild.LambdaBaseImage.yaml | 2 +- .github/workflows/DockerBuild.NotebookImage.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/DockerBuild.LambdaBaseImage.yaml b/.github/workflows/DockerBuild.LambdaBaseImage.yaml index 557f00c845..0bc549345b 100644 --- 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 diff --git a/.github/workflows/DockerBuild.NotebookImage.yaml b/.github/workflows/DockerBuild.NotebookImage.yaml index 0b5815ef08..47b961c835 100644 --- 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 From 289de18850914c9e513ff908001643974608c87d Mon Sep 17 00:00:00 2001 From: Jay Roebuck Date: Tue, 9 Jul 2024 14:35:11 -0400 Subject: [PATCH 4/4] update action dependencies --- .github/workflows/DockerBuild.LambdaBaseImage.yaml | 10 +++++----- .github/workflows/DockerBuild.NotebookImage.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/DockerBuild.LambdaBaseImage.yaml b/.github/workflows/DockerBuild.LambdaBaseImage.yaml index 0bc549345b..dd603c35b9 100644 --- a/.github/workflows/DockerBuild.LambdaBaseImage.yaml +++ b/.github/workflows/DockerBuild.LambdaBaseImage.yaml @@ -28,14 +28,14 @@ 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 }} @@ -43,7 +43,7 @@ jobs: - 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 index 47b961c835..d4c7c58e2d 100644 --- a/.github/workflows/DockerBuild.NotebookImage.yaml +++ b/.github/workflows/DockerBuild.NotebookImage.yaml @@ -32,10 +32,10 @@ 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 }} @@ -43,7 +43,7 @@ jobs: - 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