Skip to content
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.

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

Renamed "pangeo" top level image to "jupyterlab3-build" with new CI variable #9

Merged
merged 1 commit into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions base_images/pangeo/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
11 changes: 6 additions & 5 deletions gitlab-ci/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ vanilla:
refs:
- main

pangeo:
build_custom:
stage: build

before_script:
Expand All @@ -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

Expand Down Expand Up @@ -157,6 +157,7 @@ miniconda3:

except:
variables:
- $BUILD_CUSTOM_IMAGE
- $BASE_IMAGE_BUILD

edav:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.