Skip to content

Notebook Docker: use conda-forge/pypi #2266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtroe merged 2 commits into from
Apr 21, 2025
Merged

Notebook Docker: use conda-forge/pypi #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05d2860
Notebook Docker: avoid using anaconda defaults
jtroe Apr 21, 2025
05696cb
bump default to v2.4.1, ensure patches installed
jtroe Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/DockerBuild.AzureFunctionsBaseImage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
version:
description: "Version of ArcGIS API for Python to install in the image"
type: string
default: "2.3.1"
default: "2.4.1"
python_version:
description: "Python version to base image on"
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/DockerBuild.LambdaBaseImage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
version:
description: "Version of ArcGIS API for Python to install in the image"
type: string
default: "2.3.1"
default: "2.4.1"
python_version:
description: "Python version to base image on"
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/DockerBuild.NotebookImage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
version:
description: "Version of ArcGIS API for Python to install in the image"
type: string
default: "2.3.1"
default: "2.4.1"
python_version:
description: "Python version to base image on"
type: string
Expand Down
2 changes: 1 addition & 1 deletion docker/AzureFunctionsBaseImage.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ LABEL org.opencontainers.image.source=https://github.com/esri/arcgis-python-api
RUN apt-get update && apt-get install -y gcc libkrb5-dev krb5-config krb5-user && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN pip3 install azure-functions && rm -rf /home/.cache/pip
# install arcgis
ARG arcgis_version="2.3.1"
ARG arcgis_version="2.4.1"
# adding .* ensures the latest patch version is installed
RUN pip3 install "arcgis==${arcgis_version}.*" && rm -rf /home/.cache/pip
2 changes: 1 addition & 1 deletion docker/LambdaBaseImage.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
ARG arcgis_version="2.4.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
Expand Down
22 changes: 18 additions & 4 deletions docker/NotebookImage.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ ARG python_version="3.11"
FROM quay.io/jupyter/minimal-notebook:python-${python_version}

ARG python_version
ARG arcgis_version="2.4.0"
ARG arcgis_version="2.4.1"
ARG gdal_version="3.10.2"
ARG sampleslink="https://github.com/Esri/arcgis-python-api/releases/download/v${arcgis_version}/samples.zip"
ARG githubfolder="arcgis-python-api"
ARG env_name=arcgis
Expand All @@ -14,14 +15,27 @@ LABEL org.opencontainers.image.source=https://github.com/Esri/arcgis-python-api

USER ${NB_UID}

# Install Python API from Conda
RUN conda create -n ${env_name} -c esri -c defaults arcgis=${arcgis_version} python=${python_version} -y --quiet --override-channels \
# Create conda environment with specified python version
RUN conda create -n ${env_name} -c conda-forge python=${python_version} -y --quiet --override-channels \
&& conda clean --all -f -y \
&& find /opt/conda -name __pycache__ -type d -exec rm -rf {} +

# Install gdal
RUN conda install -n ${env_name} -c conda-forge gdal=${gdal_version} -y --quiet --override-channels \
&& conda clean --all -f -y \
&& find /opt/conda -name __pycache__ -type d -exec rm -rf {} +

# Install ArcGIS API for Python from pypi
RUN . activate ${env_name} \
# adding .* ensures the latest patch version is installed
&& python -m pip install "arcgis==${arcgis_version}.*" \
&& conda clean --all -f -y \
&& find /opt/conda -name __pycache__ -type d -exec rm -rf {} +

# Install arcgis-mapping if arcgis_version >= 2.4.0
RUN (dpkg --compare-versions $arcgis_version ge 2.4.0 \
&& conda install -n ${env_name} -c esri -c defaults arcgis-mapping -y --quiet --override-channels \
&& . activate ${env_name} \
&& python -m pip install arcgis-mapping \
&& conda clean --all -f -y \
&& find /opt/conda -name __pycache__ -type d -exec rm -rf {} +;) \
|| echo "[INFO] Skipped installing arcgis-mapping for version $arcgis_version (>= 2.4.0 required for arcgis-mapping)"
Expand Down