diff --git a/base/Dockerfile b/base/Dockerfile index a30e1e4f7996c529827d304d709b6363fe3e20f7..82f900034626d417526b83f81512e29e2f9bf9cd 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -32,7 +32,6 @@ RUN apt-get update --yes && \ gcc \ gettext \ git \ - libnss-wrapper \ llvm \ lsof \ mpich \ @@ -119,10 +118,6 @@ RUN fix-permissions /opt/app-root/ && \ fix-permissions /usr/local/lib/R/site-library && \ fix-permissions /usr/etc/jupyter/ -# to support OpenShift's arbitrary UIDs -# more info: https://docs.openshift.com/enterprise/3.1/creating_images/guidelines.html -COPY base/passwd.template /tmp/passwd.template -COPY base/group.template /tmp/group.template COPY base/start-notebook.sh /opt/app-root/etc/ COPY base/.spynnaker.cfg /opt/app-root/src/ RUN chmod +x /opt/app-root/etc/start-notebook.sh diff --git a/base/group.template b/base/group.template deleted file mode 100644 index a957d0695246d100aae8a5ed23b5922d2688f361..0000000000000000000000000000000000000000 --- a/base/group.template +++ /dev/null @@ -1,2 +0,0 @@ -nb_group:x:${GROUP_ID}: -nb_group_user:x:${USER_ID}: \ No newline at end of file diff --git a/base/passwd.template b/base/passwd.template deleted file mode 100644 index bb42cf7afc363193bab1ddbab51a1d8b76341105..0000000000000000000000000000000000000000 --- a/base/passwd.template +++ /dev/null @@ -1,14 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/sbin/nologin -daemon:x:2:2:daemon:/sbin:/sbin/nologin -adm:x:3:4:adm:/var/adm:/sbin/nologin -lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin -sync:x:5:0:sync:/sbin:/bin/sync -shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown -halt:x:7:0:halt:/sbin:/sbin/halt -mail:x:8:12:mail:/var/spool/mail:/sbin/nologin -operator:x:11:0:operator:/root:/sbin/nologin -games:x:12:100:games:/usr/games:/sbin/nologin -ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin -nobody:x:99:99:Nobody:/:/sbin/nologin -${USER}:x:${USER_ID}:${GROUP_ID}:${USER_DESCRIPTION}:${HOME}:/bin/bash \ No newline at end of file diff --git a/base/start-notebook.sh b/base/start-notebook.sh index 0acc0fb45174f4bd899b1cd6357bf8f530cff31c..4c2eb7c368cd4baf9da4a7deda9ac389ddf21edb 100644 --- a/base/start-notebook.sh +++ b/base/start-notebook.sh @@ -1,15 +1,5 @@ #!/bin/bash set -e -# to support OpenShift's arbitrary UIDs -# more info: https://docs.openshift.com/enterprise/3.1/creating_images/guidelines.html -export USER_ID=$(id -u) -export GROUP_ID=$(id -g) -export USER_DESCRIPTION="Notebook User" -envsubst < /tmp/passwd.template > /tmp/passwd -envsubst < /tmp/group.template > /tmp/group -export LD_PRELOAD=libnss_wrapper.so -export NSS_WRAPPER_PASSWD=/tmp/passwd -export NSS_WRAPPER_GROUP=/tmp/group # Disable core dumps ulimit -c 0 exec jupyter labhub --NotebookApp.default_url=/lab --config=/opt/app-root/etc/jupyter_notebook_config.py $@