Compare commits

...

4 Commits
main ... R4-2

3 changed files with 6 additions and 8 deletions

View File

@ -1,4 +1,4 @@
FROM d4science/r-full:latest
FROM d4science/r-full:4.2
LABEL org.d4science.image.licenses="EUPL-1.2" \
org.d4science.image.source="https://code-repo.d4science.org/gCubeSystem/rstudio-base" \
@ -17,8 +17,6 @@ ARG NB_USER="jovyan"
ARG NB_UID="1000"
ARG NB_GID="100"
ARG HOME="/home/${NB_USER}"
ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=2022.02.1+461
ENV DEFAULT_USER="jovyan"
ENV USERID="1000"
ENV GROUPID="100"
@ -68,7 +66,7 @@ RUN pip3 install \
jsonschema'[format,format-nongpl]' \
jupyterhub \
jupyterlab \
jupyter-rsession-proxy \
jupyter-rsession-proxy==2.2.1 \
jupyter-server-proxy \
notebook

6
Jenkinsfile vendored
View File

@ -16,7 +16,7 @@ pipeline {
stages {
stage('Cloning Git') {
steps {
git([url: git_url, branch: 'master', credentialsId: '88b54962-1c0e-49cb-8155-22276860f346'])
git([url: git_url, branch: 'R4-2', credentialsId: '88b54962-1c0e-49cb-8155-22276860f346'])
}
}
@ -32,7 +32,7 @@ pipeline {
script {
docker.withRegistry( '', registryCredential ) {
dockerImage.push("$BUILD_NUMBER")
dockerImage.push('latest')
dockerImage.push('2023-03-R4-2')
}
}
@ -41,7 +41,7 @@ pipeline {
stage('Remove Unused docker image') {
steps{
sh "docker rmi $imagename:$BUILD_NUMBER"
sh "docker rmi $imagename:latest"
sh "docker rmi $imagename:2023-03-R4-2"
}
}

View File

@ -4,7 +4,7 @@ session-quit-child-processes-on-exit=0
session-default-working-dir=~
session-default-new-project-dir=~
# session-save-action-default=yes
allow-shell=1
allow-shell=0
#allow-terminal-websockets=1
limit-cpu-time-minutes=0
limit-file-upload-size-mb=0