Merge pull request #1793 from jyaistMap/next

Merge changes from the master branch into the next branch for release

.github/workflows/DockerBuild.LambdaBaseImage.yaml

@@ -3,6 +3,23 @@ name: DockerBuild.LambdaImage
 on:
   # allow it to be run on-demand
   workflow_dispatch:
+    inputs:
+      version:
+        description: "Version of ArcGIS API for Python to install in the image"
+        type: string
+        default: "2.2.0"
+      python_version:
+        description: "Python version to base image on"
+        type: string
+        default: "3.9"
+      is_latest_release:
+        description: "Version of ArcGIS API for Python is Latest current release"
+        type: boolean
+        default: false
+      is_default_supported_python:
+        description: "Python version is default supported version (i.e. python used by Pro and Enterprise)"
+        type: boolean
+        default: false
 
 jobs:
   build-and-push:
@@ -31,10 +48,10 @@ jobs:
           images: |
             ghcr.io/esri/arcgis-python-api-lambda
           tags: |
-            type=raw,value=2.2.0,enable={{is_default_branch}}
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=schedule,pattern={{date 'YY.MM'}},enable={{is_default_branch}}
-            type=sha,format=long
+            type=raw,value=${{ inputs.version }}-python${{ inputs.python_version }}
+            type=raw,value=${{ inputs.version }},enable=${{ inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+            type=raw,value=latest,enable=${{ inputs.is_latest_release && inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+            type=schedule,pattern={{date 'YY.MM'}},enable=${{ inputs.is_latest_release && inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
 
       - id: docker_build
         name: Build image and push to GitHub Container Registry
@@ -43,6 +60,9 @@ jobs:
           # relative path to the place where source code with Dockerfile is located
           context: .
           file: ./docker/LambdaBaseImage.Dockerfile
+          build-args: |
+            python_version=${{ inputs.python_version }}
+            arcgis_version=${{ inputs.version }}
           tags: ${{ steps.meta.outputs.tags }}
           provenance: false
           platforms: linux/amd64

.github/workflows/DockerBuild.NotebookImage.yaml

@@ -0,0 +1,69 @@
+name: DockerBuild.NotebookImage
+
+on:
+  # allow it to be run on-demand
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version of ArcGIS API for Python to install in the image"
+        type: string
+        default: "2.2.0"
+      python_version:
+        description: "Python version to base image on"
+        type: string
+        default: "3.9"
+      is_latest_release:
+        description: "Version of ArcGIS API for Python is Latest current release"
+        type: boolean
+        default: false
+      is_default_supported_python:
+        description: "Python version is default supported version (i.e. python used by Pro and Enterprise)"
+        type: boolean
+        default: false
+
+jobs:
+  build-and-push:
+    name: Build Docker image and push to ghcr.io
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Github Packages
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ghcr.io/esri/arcgis-python-api-notebook
+          tags: |
+            type=raw,value=${{ inputs.version }}-python${{ inputs.python_version }}
+            type=raw,value=${{ inputs.version }},enable=${{ inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+            type=raw,value=latest,enable=${{ inputs.is_latest_release && inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+            type=schedule,pattern={{date 'YY.MM'}},enable=${{ inputs.is_latest_release && inputs.is_default_supported_python && github.ref_name == github.event.repository.default_branch }}
+
+      - id: docker_build
+        name: Build image and push to GitHub Container Registry
+        uses: docker/build-push-action@v4
+        with:
+          # relative path to the place where source code with Dockerfile is located
+          context: ./docker
+          file: ./docker/NotebookImage.Dockerfile
+          build-args: |
+            python_version=${{ inputs.python_version }}
+            arcgis_version=${{ inputs.version }}
+          tags: ${{ steps.meta.outputs.tags }}
+          provenance: false
+          platforms: linux/amd64
+          push: true

README.md

@@ -8,13 +8,14 @@ This SDK repository contains the following items:
 * API Reference Documentation. A hosted version of this can be found [here](https://developers.arcgis.com/python/api-reference/).
 * Samples as Jupyter Notebooks.
 * Guides chapters as Jupyter Notebooks.
+* API Reference Documentation can be found [here](https://developers.arcgis.com/python/api-reference/).  Downloads are available for current and previous versions [here](https://developers.arcgis.com/downloads/#python).
 
 You have multiple ways of executing these notebooks as listed below:
 
- - Execute locally on your computer by installing anaconda and the API. See help [here](https://developers.arcgis.com/python/guide/install-and-set-up/#Installation-using-Anaconda-for-Python-Distribution)
- - Execute with ArcGIS Pro. See help [here](https://developers.arcgis.com/python/guide/install-and-set-up/#Installation-for-ArcGIS-Pro-2.5.x-and-later)
+ - Execute locally on your computer by installing anaconda and the API. See _Install and set up_ help [Package managers](https://developers.arcgis.com/python/guide/anaconda/)
+ - Execute with ArcGIS Pro. See the _Install and set up_ [ArcGIS Pro](https://developers.arcgis.com/python/guide/arcgis-pro/) topic. For additional details, see [Notebooks in ArcGIS Pro](https://pro.arcgis.com/en/pro-app/latest/arcpy/get-started/pro-notebooks.htm).
  - Execute with ArcGIS Notebooks, hosted on ArcGIS Online. Checkout [this group](https://www.arcgis.com/home/group.html?id=2464da88f55e45d89aedcae843167f51#overview) with sample notebooks.
- - Execute in a Dockerised environment. See help [here](https://developers.arcgis.com/python/guide/install-and-set-up/#Installation-as-a-Docker-image)
+ - Execute in a Dockerised environment. See _Install and set up_ help [Installation as Docker image](https://developers.arcgis.com/python/guide/install-and-set-up/#installation-as-a-docker-image)
  - Execute with Binder. See help [here](https://mybinder.org/)
 
 ## Issues