Feature/container url dropdown (#155)

* first attempt of container urls being a dropdown * fixed bug with dropdown not changing * only one call to getWorkspaces * added env vars to devfiles and edited dockerimage_path name * updated the algorithms extension version * added DEFAULT_DOCKERFILE_PATH as env variable * added 2nd --build-arg tag * corrected the dps base image url * added print statements to jupyter server extension * reverted back to old jupyter server extension right after removing need for environments.json to see if this fixes the problem * reverted changes for container url dropdown branch * corrected default and base image to be switched back
MAAP-Project · Dec 10, 2024 · 049f0cf · 049f0cf
1 parent c82a98d
commit 049f0cf
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 14 deletions.
diff --git a/base_images/build-image.sh b/base_images/build-image.sh
@@ -12,7 +12,8 @@ for dir in ${DIRS}; do
     pushd $base_image_dir/$dir
     IMAGE_NAME=$(basename $dir)
     IMAGE_REF=${CI_REGISTRY_IMAGE}/base_images/${IMAGE_NAME}:${BRANCH}
-    docker build -t ${IMAGE_REF} --build-arg IMAGE_REF=${IMAGE_REF} -f docker/Dockerfile .
+    DEFAULT_DOCKERFILE_PATH=${CI_REGISTRY_IMAGE}/custom_images/maap_base:${BRANCH}
+    docker build -t ${IMAGE_REF} --build-arg IMAGE_REF=${IMAGE_REF} --build-arg DEFAULT_DOCKERFILE_PATH=${DEFAULT_DOCKERFILE_PATH} -f docker/Dockerfile .
     docker push ${IMAGE_REF}
     popd
     echo "$IMAGE_REF" >> built_images.txt

diff --git a/base_images/isce3/docker/Dockerfile b/base_images/isce3/docker/Dockerfile
@@ -23,4 +23,6 @@ RUN source activate isce3 && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
diff --git a/base_images/pangeo/docker/Dockerfile b/base_images/pangeo/docker/Dockerfile
@@ -20,4 +20,6 @@ RUN source activate pangeo && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
diff --git a/base_images/python/docker/Dockerfile b/base_images/python/docker/Dockerfile
@@ -20,4 +20,6 @@ RUN source activate python && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
diff --git a/base_images/r/docker/Dockerfile b/base_images/r/docker/Dockerfile
@@ -55,4 +55,6 @@ RUN source activate r && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
diff --git a/custom_images/build-image.sh b/custom_images/build-image.sh
@@ -14,7 +14,8 @@ for dir in "${DIRS_LIST[@]}"; do
     IMAGE_NAME=$(basename "$dir")
     IMAGE_PATH=$(basename "$base_image_dir")
     IMAGE_REF=${CI_REGISTRY_IMAGE}/${IMAGE_PATH}/${IMAGE_NAME}:${BRANCH}
-    docker build -t "${IMAGE_REF}" --build-arg IMAGE_REF="${IMAGE_REF}" -f docker/Dockerfile .
+    DEFAULT_DOCKERFILE_PATH=${CI_REGISTRY_IMAGE}/custom_images/maap_base:${BRANCH}
+    docker build -t "${IMAGE_REF}" --build-arg IMAGE_REF="${IMAGE_REF}" --build-arg DEFAULT_DOCKERFILE_PATH=${DEFAULT_DOCKERFILE_PATH} -f docker/Dockerfile .
     docker push "${IMAGE_REF}"
     popd
     echo "$IMAGE_REF" >> built_images.txt

diff --git a/devfiles/isce3/devfile/devfile.yaml b/devfiles/isce3/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/isce3:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/isce3:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org

diff --git a/devfiles/pangeo/devfile/devfile.yaml b/devfiles/pangeo/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/pangeo:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/pangeo:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org

diff --git a/devfiles/python/devfile/devfile.yaml b/devfiles/python/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/python:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/python:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org

diff --git a/devfiles/r/devfile/devfile.yaml b/devfiles/r/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/r:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/r:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org

diff --git a/jupyterlab/pangeo/environment.yml b/jupyterlab/pangeo/environment.yml
@@ -36,12 +36,12 @@ dependencies:
     - jupyter-resource-usage==1.0.2
     - git+https://github.com/MAAP-Project/[email protected]#egg-info=stac_ipyleaflet
     - rio-tiler==6.2.8
-    - maap-algorithms-jupyter-extension==0.3.6
+    - maap-algorithms-jupyter-extension==0.3.8
     - maap-che-sidebar-visibility-jupyter-extension==1.1.2
     - maap-dps-jupyter-extension==0.7.2
     - maap-edsc-jupyter-extension==1.1.1
     - maap-help-jupyter-extension==2.0.0
-    - maap-jupyter-server-extension==2.1.0
+    - maap-jupyter-server-extension==2.1.1
     - maap-libs-jupyter-extension==1.2.4
     - maap-user-workspace-management-jupyter-extension==0.1.3
 variables:

diff --git a/jupyterlab/shared/environment.yml b/jupyterlab/shared/environment.yml
@@ -18,12 +18,12 @@ dependencies:
   - pip:
     - jupyter-resource-usage==1.0.2
     - git+https://github.com/MAAP-Project/[email protected]#egg-info=stac_ipyleaflet
-    - maap-algorithms-jupyter-extension==0.3.6
+    - maap-algorithms-jupyter-extension==0.3.8
     - maap-che-sidebar-visibility-jupyter-extension==1.1.2
     - maap-dps-jupyter-extension==0.7.2
     - maap-edsc-jupyter-extension==1.1.1
     - maap-help-jupyter-extension==2.0.0
-    - maap-jupyter-server-extension==2.1.0
+    - maap-jupyter-server-extension==2.1.1
     - maap-libs-jupyter-extension==1.2.4
     - maap-user-workspace-management-jupyter-extension==0.1.3
 variables: