diff options
| -rw-r--r-- | Dockerfile | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -5,8 +5,8 @@ LABEL maintainer="jhunk@stsci.edu" \ vendor="Space Telescope Science Institute" ARG NB_USER="jovyan" -ARG NB_UID="1100" -ARG NB_GID="110" +ARG NB_UID="1000" +ARG NB_GID="100" USER root WORKDIR "${TOOLCHAIN_BUILD}" @@ -23,13 +23,6 @@ ENV NB_USER="${NB_USER}" \ ENV NB_HOME="/home/${NB_USER}" ADD scripts/fix-permissions /usr/local/bin/fix-permissions -# Create jovyan user with UID=1100 and in the 'users' group -# and make sure these dirs are writable by the `users` group. -RUN echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su && \ - useradd -m -s /bin/bash -N -u $NB_UID $NB_USER && \ - chmod g+w /etc/passwd && \ - fix-permissions $NB_HOME && \ - echo "root ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/rewt # Begin toolchain image-specific steps USER "${USER_ACCT}" @@ -38,13 +31,21 @@ RUN sudo chown -R ${USER_ACCT}: ${TOOLCHAIN_BUILD} \ && bin/build.sh \ && sudo rm -rf "${TOOLCHAIN_BUILD}" +# Replace user 'developer' with 'jovyan' +USER root +RUN usermod -l ${NB_USER} ${USER_ACCT} \ + && usermod -g ${NB_GID} -G ${USER_ACCT} ${NB_USER} \ + && chown -R ${NB_USER}:${NB_UID} ${NB_HOME} \ + && chmod g+w /etc/passwd \ + && fix-permissions ${NB_HOME} + # Begin jupyterhub specific steps ENV HOME="${NB_HOME}" USER "${NB_UID}" # Setup work directory for backward-compatibility -RUN mkdir /home/$NB_USER/work && \ - fix-permissions /home/$NB_USER && \ +RUN mkdir ${NB_HOME}/work && \ + fix-permissions ${NB_HOME} && \ jupyter notebook --generate-config USER root |