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.

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

Feature/container url dropdown #155

Merged
merged 16 commits into from
Dec 10, 2024
Merged

Feature/container url dropdown #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a998ccc
Merge branch 'develop' of github.com:MAAP-Project/maap-workspaces int…
grallewellyn Oct 25, 2024
60cc5f1
first attempt of container urls being a dropdown
grallewellyn Nov 4, 2024
c17a977
fixed bug with dropdown not changing
grallewellyn Nov 5, 2024
c5d89e4
only one call to getWorkspaces
grallewellyn Nov 5, 2024
19a90f2
Merge branch 'develop' of github.com:MAAP-Project/maap-workspaces int…
grallewellyn Nov 14, 2024
e452c17
Merge branch 'develop' of github.com:MAAP-Project/maap-workspaces int…
grallewellyn Nov 18, 2024
1c87fc0
added env vars to devfiles and edited dockerimage_path name
grallewellyn Nov 21, 2024
bc54905
updated the algorithms extension version
grallewellyn Nov 22, 2024
aa233ea
added DEFAULT_DOCKERFILE_PATH as env variable
grallewellyn Nov 22, 2024
8df24f7
added 2nd --build-arg tag
grallewellyn Nov 22, 2024
117d8a8
merged develop
grallewellyn Nov 22, 2024
9c897d3
corrected the dps base image url
grallewellyn Nov 23, 2024
277f230
added print statements to jupyter server extension
grallewellyn Nov 26, 2024
2a7a401
reverted back to old jupyter server extension right after removing ne…
grallewellyn Dec 2, 2024
6e4fc16
reverted changes for container url dropdown branch
grallewellyn Dec 4, 2024
e59e122
corrected default and base image to be switched back
grallewellyn Dec 4, 2024
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
3 changes: 2 additions & 1 deletion base_images/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion base_images/isce3/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
4 changes: 3 additions & 1 deletion base_images/pangeo/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
4 changes: 3 additions & 1 deletion base_images/python/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
4 changes: 3 additions & 1 deletion base_images/r/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
3 changes: 2 additions & 1 deletion custom_images/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion devfiles/isce3/devfile/devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion devfiles/pangeo/devfile/devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion devfiles/python/devfile/devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion devfiles/r/devfile/devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions jupyterlab/pangeo/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions jupyterlab/shared/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down