Merge pull request #9 from MAAP-Project/features/add-pangeo-workspace

Renamed "pangeo" top level image to "jupyterlab3-build" with new CI variable
MAAP-Project · Feb 15, 2023 · 9a61011 · 9a61011
2 parents b2e75c8 + e2d8514
commit 9a61011
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/base_images/pangeo/docker/Dockerfile b/base_images/pangeo/docker/Dockerfile
@@ -14,9 +14,9 @@ RUN conda install -c conda-forge mamba && \
     mamba install -c conda-forge -y conda-lock gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \
     pygeos=0.14 pyproj=3.4.1 rasterio=1.3.4 scipy=1.10.0
 
-ONBUILD RUN echo "Checking for 'conda-linux-64.lock'..." \
-        ; if test -f "conda-linux-64.lock" ; then \
-        mamba install --file conda-linux-64.lock \
+ONBUILD RUN echo "Checking for 'pangeo/conda-linux-64.lock'..." \
+        ; if test -f "pangeo/conda-linux-64.lock" ; then \
+        mamba install --file pangeo/conda-linux-64.lock \
         ; fi
 
 RUN find /opt/conda/ -follow -type f -name '*.a' -delete \

diff --git a/gitlab-ci/.gitlab-ci.yml b/gitlab-ci/.gitlab-ci.yml
@@ -27,7 +27,7 @@ vanilla:
     refs:
       - main
 
-pangeo:
+build_custom:
   stage: build
 
   before_script:
@@ -39,20 +39,20 @@ pangeo:
     - pushd maap-workspaces
     - LATEST_COMMIT=$(git log -n 1 --all --format='%h')
     - git checkout ${LATEST_COMMIT}
-    - bash base_images/build-image.sh pangeo
+    - bash base_images/build-image.sh ${BUILD_CUSTOM_IMAGE}
     - cat built_images.txt
     - export BASE_IMAGE_NAME=$(tail -1 built_images.txt)
-    - bash pangeo/build-image.sh
+    - bash jupyterlab3-build/build-image.sh
 
   tags:
     - shell
 
   only:
     variables:
-      - $BASE_IMAGE_BUILD
+      - $BUILD_CUSTOM_IMAGE
     refs:
       - main
-
+      
 r:
   stage: build
 
@@ -157,6 +157,7 @@ miniconda3:
 
   except:
     variables:
+      - $BUILD_CUSTOM_IMAGE
       - $BASE_IMAGE_BUILD
 
 edav:

diff --git a/pangeo/build-image.sh → jupyterlab3-build/build-image.sh b/pangeo/build-image.sh → jupyterlab3-build/build-image.sh
diff --git a/pangeo/docker/Dockerfile → jupyterlab3-build/docker/Dockerfile b/pangeo/docker/Dockerfile → jupyterlab3-build/docker/Dockerfile
diff --git a/pangeo/entrypoint.sh → jupyterlab3-build/entrypoint.sh b/pangeo/entrypoint.sh → jupyterlab3-build/entrypoint.sh
diff --git a/pangeo/environments.json → jupyterlab3-build/environments.json b/pangeo/environments.json → jupyterlab3-build/environments.json
diff --git a/pangeo/jupyter_patch → jupyterlab3-build/jupyter_patch b/pangeo/jupyter_patch → jupyterlab3-build/jupyter_patch
diff --git a/pangeo/docker/conda-linux-64.lock → jupyterlab3-build/pangeo/conda-linux-64.lock b/pangeo/docker/conda-linux-64.lock → jupyterlab3-build/pangeo/conda-linux-64.lock