DEV - Simplify Docker images

.dockerignore

@@ -1,2 +1,6 @@
 data
 examples/docker/data
+
+# ignore test files
+conda-store-server/tests
+conda-store/tests

conda-store-server/Dockerfile

@@ -1,11 +1,13 @@
-FROM condaforge/mambaforge:23.3.1-1 as base
+FROM condaforge/mambaforge:24.3.0-0 as base
 
 LABEL org.opencontainers.image.authors="conda-store development team"
 
-ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store-server/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}
 ENV TZ=Etc/UTC
 
+ARG python_version=3.10
+ARG conda_env_name="conda-store-server"
+
 RUN apt-get update && \
     # https://docs.anaconda.org/anaconda/install/linux/#installing-on-linux
     apt-get install -yq --no-install-recommends \
     libgl1-mesa-glx \
@@ -39,28 +41,41 @@
 
 USER 1000:1000
 
-COPY environment.yaml /opt/conda-store-server/environment.yaml
+RUN mamba create --name ${conda_env_name} \
+    python=${python_version} conda \
+    --channel conda-forge -y && \
+    conda clean --force-pkgs-dirs --all -y
 
-RUN mamba env create -f /opt/conda-store-server/environment.yaml && \
-	conda clean  --force-pkgs-dirs
+# ensure we are using the conda environment
+ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store-server/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}
 
 COPY ./ /opt/conda-store-server/
 
 USER 0:0
 RUN chown -R 1000:1000 /opt/conda-store-server/
 USER 1000:1000
 
+# ---------------------------------------------------------------------------------
+# for production-ready images we install a specific version of conda-store-server
 FROM base as prod
+
 ARG RELEASE_VERSION
-RUN cd /opt/conda-store-server && \
-    /opt/conda/envs/conda-store-server/bin/pip install conda-store-server==${RELEASE_VERSION} && \
+
+WORKDIR /opt/conda-store-server
+RUN which python && \
+    python -m pip install conda-store-server==${RELEASE_VERSION} --no-cache-dir && \
     rm -rf /opt/conda-store-server/tests
 
 WORKDIR /var/lib/conda-store
+# ---------------------------------------------------------------------------------
 
+# ---------------------------------------------------------------------------------
+# for development images we install conda-store-server in editable mode
 FROM base as dev
 
-RUN cd /opt/conda-store-server && \
-    /opt/conda/envs/conda-store-server/bin/pip install -e .
+WORKDIR /opt/conda-store-server
+RUN which python && \
+    python -m pip install -e . --no-cache-dir
 
 WORKDIR /var/lib/conda-store
+# ---------------------------------------------------------------------------------

conda-store/Dockerfile

@@ -1,8 +1,8 @@
-FROM condaforge/mambaforge:23.3.1-1 as base
+FROM condaforge/mambaforge:24.3.0-0 as base
 
 LABEL org.opencontainers.image.authors="conda-store development team"
 
 RUN apt-get update &&  \
     apt-get install -yq --no-install-recommends curl && \
     apt-get clean && \
     rm -rf /var/cache/apt/* &&\
@@ -16,22 +16,36 @@
 COPY environment.yaml /opt/conda-store/environment.yaml
 
 RUN mamba env create -f /opt/conda-store/environment.yaml && \
-mamba clean --all -y && \
-conda clean --force-pkgs-dirs
+    mamba clean --all -y && \
+    conda clean --force-pkgs-dirs
 
+# ensure we are using the conda environment
 ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}
 
 COPY ./ /opt/conda-store/
 
+# ---------------------------------------------------------------------------------
+# for production-ready images we install a specific version of conda-store
 FROM base as prod
+
 ARG RELEASE_VERSION
-RUN cd /opt/conda-store && \
-    pip install conda-store==${RELEASE_VERSION}
+
+WORKDIR /opt/conda-store
+RUN which python && \
+    python -m pip install conda-store==${RELEASE_VERSION} --no-cache-dir
+
 USER conda-store
 WORKDIR /opt/jupyterhub
+# ---------------------------------------------------------------------------------
 
+# ---------------------------------------------------------------------------------
+# for development images we install conda-store-server in editable mode
 FROM base as dev
+
 RUN --mount=type=cache,target=/root/.cache/pip cd /opt/conda-store && \
-    pip install -e . --no-cache
+    which python && \
+    python -m pip install -e . --no-cache-dir
+
 USER conda-store
 WORKDIR /opt/jupyterhub
+# ---------------------------------------------------------------------------------

conda-store/environment.yaml

@@ -1,7 +1,10 @@
+# This environment file should only be used to build conda-store Docker images
+# for development purposes only - these images are built through GitHub actions
 name: conda-store
 channels:
   - conda-forge
 dependencies:
+  - python=3.10
   - nb_conda_kernels
   - nodejs=18
   - yarn