From fe9fc024fe2ffc305b14577313722d468b5beeff Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 30 Mar 2022 19:20:20 +0200 Subject: [PATCH] Add labels to the image. Fix userconf. --- 02_userconf.sh | 3 +-- Dockerfile | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/02_userconf.sh b/02_userconf.sh index a604569..9831fe2 100644 --- a/02_userconf.sh +++ b/02_userconf.sh @@ -64,8 +64,7 @@ if [ "$USERID" -ne 1000 ] elif [ "$USER" != "$DEFAULT_USER" ] then ## 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 + cp -r /home/$DEFAULT_USER/.??* /home/$USER || true ## RENAME the user usermod -l $USER -d /home/$USER $DEFAULT_USER groupmod -n $USER $DEFAULT_USER diff --git a/Dockerfile b/Dockerfile index 815b8cb..1082088 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,10 @@ 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 " \ + org.d4science.image.authors="Andrea Dell'Amico , Roberto Cirillo " \ + org.d4science.image.r_version="2022.02.1+461" ENV S6_VERSION=v2.1.0.2 ENV RSTUDIO_VERSION=2022.02.1+461