gCubeSystem
/
docker-jenkins-integration-test
15
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add labels to the image. Fix userconf. #13

Merged
andrea.dellamico merged 1 commits from andrea.dellamico/docker-jenkins-integration-test:master into master 2022-03-30 19:21:28 +02:00
Conversation 0 Commits 1 Files Changed 2 +6 -2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
02_userconf.sh
View File

@ -64,8 +64,7 @@ if [ "$USERID" -ne 1000 ]
elif [ "$USER" != "$DEFAULT_USER" ] elif [ "$USER" != "$DEFAULT_USER" ]
then then
## cannot move home folder when it's a shared volume, have to copy and change permissions instead ## cannot move home folder when it's a shared volume, have to copy and change permissions instead
cp -r /home/$DEFAULT_USER/* /home/$USER cp -r /home/$DEFAULT_USER/.??* /home/$USER || true
cp -r /home/$DEFAULT_USER/.??* /home/$USER
## RENAME the user ## RENAME the user
usermod -l $USER -d /home/$USER $DEFAULT_USER usermod -l $USER -d /home/$USER $DEFAULT_USER
groupmod -n $USER $DEFAULT_USER groupmod -n $USER $DEFAULT_USER

5
Dockerfile
View File

@ -1,5 +1,10 @@
FROM d4science/r-full:latest FROM d4science/r-full:latest
LABEL org.d4science.image.licenses="EUPL-1.2" \
org.d4science.image.source="https://github.com/rocker-org/rocker-versioned2" \
org.d4science.image.vendor="D4Science <https://www.d4science.org>" \
org.d4science.image.authors="Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>, Roberto Cirillo <roberto.cirillo@isti.cnr.it>" \
org.d4science.image.r_version="2022.02.1+461"
ENV S6_VERSION=v2.1.0.2 ENV S6_VERSION=v2.1.0.2
ENV RSTUDIO_VERSION=2022.02.1+461 ENV RSTUDIO_VERSION=2022.02.1+461