Skip to content
Snippets Groups Projects
Commit 734cad69 authored by Olivier Benz's avatar Olivier Benz
Browse files

Fix image for R version 4.0.5 

- Add jupyter_server_config.py
- Fix jupyter_notebook_config.py
parent 47378794
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
geospatial/.gitlab-ci.yml
+ 11
− 11
View file @ 734cad69
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE} export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE}
if [[ $CI_COMMIT_BRANCH == "master" ]]; then if [[ $CI_COMMIT_BRANCH == "master" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-latest} export CI_APP_TAG=${CI_APP_TAG:-latest}
elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then elif [[ $CI_COMMIT_BRANCH == "4.0.5-fix" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-4.0.5} export CI_APP_TAG=${CI_APP_TAG:-4.0.5}
else else
export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA} export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA}
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
--password-stdin $CI_REGISTRY --password-stdin $CI_REGISTRY
- > - >
export VERSION_MAJ_MIN_PAT=`sed -n export VERSION_MAJ_MIN_PAT=`sed -n
"s|.*verse:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p" "s|.*geospatial:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"
geospatial/$CI_APP_TAG.Dockerfile | head -1` geospatial/$CI_APP_TAG-fix.Dockerfile | head -1`
export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT | export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT |
sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"` sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"`
...@@ -83,12 +83,12 @@ build:version-linux-amd64: ...@@ -83,12 +83,12 @@ build:version-linux-amd64:
script: script:
- > - >
docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64 docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-f geospatial/$CI_APP_TAG.Dockerfile . -f geospatial/$CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes: changes:
- geospatial/4.0.5.Dockerfile - geospatial/4.0.5-fix.Dockerfile
build:version-linux-arm64v8: build:version-linux-arm64v8:
extends: .build extends: .build
...@@ -98,12 +98,12 @@ build:version-linux-arm64v8: ...@@ -98,12 +98,12 @@ build:version-linux-arm64v8:
script: script:
- > - >
docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-f geospatial/$CI_APP_TAG.Dockerfile . -f geospatial/$CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes: changes:
- geospatial/4.0.5.Dockerfile - geospatial/4.0.5-fix.Dockerfile
build-manifest:latest-linux-multiarch: build-manifest:latest-linux-multiarch:
extends: .build extends: .build
...@@ -169,6 +169,6 @@ build-manifest:version-linux-multiarch: ...@@ -169,6 +169,6 @@ build-manifest:version-linux-multiarch:
fi fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true"
changes: changes:
- geospatial/4.0.5.Dockerfile - geospatial/4.0.5-fix.Dockerfile
geospatial/4.0.5-fix.Dockerfile 0 → 100644
+ 9
− 0
View file @ 734cad69
FROM registry.gitlab.b-data.ch/jupyterlab/r/geospatial:4.0.5
USER root
RUN cp /etc/jupyter/jupyter_notebook_config.py /etc/jupyter/jupyter_server_config.py \
&& sed -i "s/c.ServerApp/c.NotebookApp/g" /etc/jupyter/jupyter_notebook_config.py \
&& sed -i "s/c.NotebookApp/c.ServerApp/g" /etc/jupyter/jupyter_server_config.py
USER ${NB_USER}
r-ver/.gitlab-ci.yml
+ 13
− 13
View file @ 734cad69
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE} export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE}
if [[ $CI_COMMIT_BRANCH == "master" ]]; then if [[ $CI_COMMIT_BRANCH == "master" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-latest} export CI_APP_TAG=${CI_APP_TAG:-latest}
elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then elif [[ $CI_COMMIT_BRANCH == "4.0.5-fix" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-4.0.5} export CI_APP_TAG=${CI_APP_TAG:-4.0.5}
else else
export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA} export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA}
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
- > - >
export VERSION_MAJ_MIN_PAT=`sed -n export VERSION_MAJ_MIN_PAT=`sed -n
"s|.*r-ver:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p" "s|.*r-ver:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"
r-ver/$CI_APP_TAG.Dockerfile | head -1` r-ver/$CI_APP_TAG-fix.Dockerfile | head -1`
export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT | export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT |
sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"` sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"`
...@@ -82,12 +82,12 @@ build:version-linux-amd64: ...@@ -82,12 +82,12 @@ build:version-linux-amd64:
script: script:
- > - >
cd r-ver && docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64 cd r-ver && docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-f $CI_APP_TAG.Dockerfile . -f $CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes: changes:
- r-ver/4.0.5.Dockerfile - r-ver/4.0.5-fix.Dockerfile
build:version-linux-arm64v8: build:version-linux-arm64v8:
extends: .build extends: .build
...@@ -97,12 +97,12 @@ build:version-linux-arm64v8: ...@@ -97,12 +97,12 @@ build:version-linux-arm64v8:
script: script:
- > - >
cd r-ver && docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 cd r-ver && docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-f $CI_APP_TAG.Dockerfile . -f $CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes: changes:
- r-ver/4.0.5.Dockerfile - r-ver/4.0.5-fix.Dockerfile
build-manifest:latest-linux-multiarch: build-manifest:latest-linux-multiarch:
extends: .build extends: .build
...@@ -168,9 +168,9 @@ build-manifest:version-linux-multiarch: ...@@ -168,9 +168,9 @@ build-manifest:version-linux-multiarch:
fi fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" - if: $CI_COMMIT_BRANCH == "4.0.5-fix"
changes: changes:
- r-ver/4.0.5.Dockerfile - r-ver/4.0.5-fix.Dockerfile
trigger-latest-build: trigger-latest-build:
extends: .build extends: .build
...@@ -190,8 +190,8 @@ trigger-version-build: ...@@ -190,8 +190,8 @@ trigger-version-build:
before_script: before_script:
- apk add --update --no-cache curl - apk add --update --no-cache curl
script: script:
- curl -X POST -F token=$JUPYTERLAB_R_TIDYVERSE -F ref=freeze-version https://gitlab.b-data.ch/api/v4/projects/167/trigger/pipeline - curl -X POST -F token=$JUPYTERLAB_R_TIDYVERSE -F ref=4.0.5-fix https://gitlab.b-data.ch/api/v4/projects/167/trigger/pipeline
rules: rules:
- if: $CI_COMMIT_REF_NAME == "freeze-version" - if: $CI_COMMIT_REF_NAME == "4.0.5-fix"
changes: changes:
- r-ver/4.0.5.Dockerfile - r-ver/4.0.5-fix.Dockerfile
r-ver/4.0.5-fix.Dockerfile 0 → 100644
+ 9
− 0
View file @ 734cad69
FROM registry.gitlab.b-data.ch/jupyterlab/r/r-ver:4.0.5
USER root
RUN cp /etc/jupyter/jupyter_notebook_config.py /etc/jupyter/jupyter_server_config.py \
&& sed -i "s/c.ServerApp/c.NotebookApp/g" /etc/jupyter/jupyter_notebook_config.py \
&& sed -i "s/c.NotebookApp/c.ServerApp/g" /etc/jupyter/jupyter_server_config.py
USER ${NB_USER}
tidyverse/.gitlab-ci.yml
+ 14
− 14
View file @ 734cad69
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE} export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE}
if [[ $CI_COMMIT_BRANCH == "master" ]]; then if [[ $CI_COMMIT_BRANCH == "master" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-latest} export CI_APP_TAG=${CI_APP_TAG:-latest}
elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then elif [[ $CI_COMMIT_BRANCH == "4.0.5-fix" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-4.0.5} export CI_APP_TAG=${CI_APP_TAG:-4.0.5}
else else
export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA} export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA}
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
--password-stdin $CI_REGISTRY --password-stdin $CI_REGISTRY
- > - >
export VERSION_MAJ_MIN_PAT=`sed -n export VERSION_MAJ_MIN_PAT=`sed -n
"s|.*r-ver:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p" "s|.*tidyverse:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"
tidyverse/$CI_APP_TAG.Dockerfile | head -1` tidyverse/$CI_APP_TAG-fix.Dockerfile | head -1`
export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT | export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT |
sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"` sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"`
...@@ -83,12 +83,12 @@ build:version-linux-amd64: ...@@ -83,12 +83,12 @@ build:version-linux-amd64:
script: script:
- > - >
docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64 docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-f tidyverse/$CI_APP_TAG.Dockerfile . -f tidyverse/$CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes: changes:
- tidyverse/4.0.5.Dockerfile - tidyverse/4.0.5-fix.Dockerfile
build:version-linux-arm64v8: build:version-linux-arm64v8:
extends: .build extends: .build
...@@ -98,12 +98,12 @@ build:version-linux-arm64v8: ...@@ -98,12 +98,12 @@ build:version-linux-arm64v8:
script: script:
- > - >
docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-f tidyverse/$CI_APP_TAG.Dockerfile . -f tidyverse/$CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes: changes:
- tidyverse/4.0.5.Dockerfile - tidyverse/4.0.5-fix.Dockerfile
build-manifest:latest-linux-multiarch: build-manifest:latest-linux-multiarch:
extends: .build extends: .build
...@@ -169,9 +169,9 @@ build-manifest:version-linux-multiarch: ...@@ -169,9 +169,9 @@ build-manifest:version-linux-multiarch:
fi fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true"
changes: changes:
- tidyverse/4.0.5.Dockerfile - tidyverse/4.0.5-fix.Dockerfile
trigger-latest-build: trigger-latest-build:
extends: .build extends: .build
...@@ -191,8 +191,8 @@ trigger-version-build: ...@@ -191,8 +191,8 @@ trigger-version-build:
before_script: before_script:
- apk add --update --no-cache curl - apk add --update --no-cache curl
script: script:
- curl -X POST -F token=$JUPYTERLAB_R_VERSE -F ref=freeze-version https://gitlab.b-data.ch/api/v4/projects/168/trigger/pipeline - curl -X POST -F token=$JUPYTERLAB_R_VERSE -F ref=4.0.5-fix https://gitlab.b-data.ch/api/v4/projects/168/trigger/pipeline
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true"
changes: changes:
- tidyverse/4.0.5.Dockerfile - tidyverse/4.0.5-fix.Dockerfile
tidyverse/4.0.5-fix.Dockerfile 0 → 100644
+ 9
− 0
View file @ 734cad69
FROM registry.gitlab.b-data.ch/jupyterlab/r/tidyverse:4.0.5
USER root
RUN cp /etc/jupyter/jupyter_notebook_config.py /etc/jupyter/jupyter_server_config.py \
&& sed -i "s/c.ServerApp/c.NotebookApp/g" /etc/jupyter/jupyter_notebook_config.py \
&& sed -i "s/c.NotebookApp/c.ServerApp/g" /etc/jupyter/jupyter_server_config.py
USER ${NB_USER}
verse/.gitlab-ci.yml
+ 14
− 14
View file @ 734cad69
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE} export CI_APP_REPO=${CI_APP_REPO:-$CI_REGISTRY_IMAGE}
if [[ $CI_COMMIT_BRANCH == "master" ]]; then if [[ $CI_COMMIT_BRANCH == "master" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-latest} export CI_APP_TAG=${CI_APP_TAG:-latest}
elif [[ $CI_COMMIT_BRANCH == "freeze-version" ]]; then elif [[ $CI_COMMIT_BRANCH == "4.0.5-fix" ]]; then
export CI_APP_TAG=${CI_APP_TAG:-4.0.5} export CI_APP_TAG=${CI_APP_TAG:-4.0.5}
else else
export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA} export CI_APP_TAG=${CI_APP_TAG:-$CI_COMMIT_SHA}
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
--password-stdin $CI_REGISTRY --password-stdin $CI_REGISTRY
- > - >
export VERSION_MAJ_MIN_PAT=`sed -n export VERSION_MAJ_MIN_PAT=`sed -n
"s|.*tidyverse:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p" "s|.*verse:\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"
verse/$CI_APP_TAG.Dockerfile | head -1` verse/$CI_APP_TAG-fix.Dockerfile | head -1`
export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT | export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT |
sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"` sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"`
...@@ -83,12 +83,12 @@ build:version-linux-amd64: ...@@ -83,12 +83,12 @@ build:version-linux-amd64:
script: script:
- > - >
docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64 docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-f verse/$CI_APP_TAG.Dockerfile . -f verse/$CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-amd64
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes: changes:
- verse/4.0.5.Dockerfile - verse/4.0.5-fix.Dockerfile
build:version-linux-arm64v8: build:version-linux-arm64v8:
extends: .build extends: .build
...@@ -98,12 +98,12 @@ build:version-linux-arm64v8: ...@@ -98,12 +98,12 @@ build:version-linux-arm64v8:
script: script:
- > - >
docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 docker build --pull -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-f verse/$CI_APP_TAG.Dockerfile . -f verse/$CI_APP_TAG-fix.Dockerfile .
- docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8 - docker push $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/ - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes: changes:
- verse/4.0.5.Dockerfile - verse/4.0.5-fix.Dockerfile
build-manifest:latest-linux-multiarch: build-manifest:latest-linux-multiarch:
extends: .build extends: .build
...@@ -169,9 +169,9 @@ build-manifest:version-linux-multiarch: ...@@ -169,9 +169,9 @@ build-manifest:version-linux-multiarch:
fi fi
docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true"
changes: changes:
- verse/4.0.5.Dockerfile - verse/4.0.5-fix.Dockerfile
trigger-latest-build: trigger-latest-build:
extends: .build extends: .build
...@@ -191,8 +191,8 @@ trigger-version-build: ...@@ -191,8 +191,8 @@ trigger-version-build:
before_script: before_script:
- apk add --update --no-cache curl - apk add --update --no-cache curl
script: script:
- curl -X POST -F token=$JUPYTERLAB_R_GEOSPATIAL -F ref=freeze-version https://gitlab.b-data.ch/api/v4/projects/169/trigger/pipeline - curl -X POST -F token=$JUPYTERLAB_R_GEOSPATIAL -F ref=4.0.5-fix https://gitlab.b-data.ch/api/v4/projects/169/trigger/pipeline
rules: rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $R_VERSION_UPDATE != "true" - if: $CI_COMMIT_BRANCH == "4.0.5-fix" && $R_VERSION_UPDATE != "true"
changes: changes:
- verse/4.0.5.Dockerfile - verse/4.0.5-fix.Dockerfile
verse/4.0.5-fix.Dockerfile 0 → 100644
+ 9
− 0
View file @ 734cad69
FROM registry.gitlab.b-data.ch/jupyterlab/r/verse:4.0.5
USER root
RUN cp /etc/jupyter/jupyter_notebook_config.py /etc/jupyter/jupyter_server_config.py \
&& sed -i "s/c.ServerApp/c.NotebookApp/g" /etc/jupyter/jupyter_notebook_config.py \
&& sed -i "s/c.NotebookApp/c.ServerApp/g" /etc/jupyter/jupyter_server_config.py
USER ${NB_USER}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment