enabling dynamic /etc/passwd

Author: borgoat

Dockerfile

@@ -11,7 +11,7 @@ LABEL maintainer                    = "giorgio.azzinnaro@gmail.com"
 RUN apt-get update &&                                       \
     apt-get -y install build-essential                      \
         python-setuptools python-pip python-dev             \
-        git curl gettext-base libnss-wrapper                \
+        git curl gettext-base                               \
         libssl-dev libreadline6-dev libkrb5-dev libffi-dev  \
         libldap2-dev libsasl2-dev zlib1g-dev
 
@@ -24,8 +24,9 @@ WORKDIR /home/ccs
 RUN pip install -r requirements-default.txt 
 
 # Create all runtime directories and ensure right permissions for OC
-RUN mkdir -p /var/db/caldavd /var/log/caldavd /var/run/caldavd && \
-    chmod -R g+rwX /home/ccs /var/db/caldavd /var/log/caldavd /var/run/caldavd
+RUN mkdir -p /var/db/caldavd /var/log/caldavd /var/run/caldavd &&                   \
+    chmod -R g+rwX /home/ccs /var/db/caldavd /var/log/caldavd /var/run/caldavd &&   \
+    chmod g=u /etc/passwd
 
 # TODO Check if everything is in this dir
 VOLUME [ "/var/db/caldavd" ]

contrib/docker/docker_cmd.sh

@@ -2,16 +2,8 @@
 
 # This is because OpenShift runs with random UIDs,
 # and ccs expects the UID to be in /etc/passwd
-PASSWD_TEMP_FILE="/home/ccs/contrib/docker/passwd.template"
-PASSWD_FILE="/tmp/passwd"
-
-export USER_ID=$(id -u)
-export GROUP_ID=$(id -g)
-envsubst < $PASSWD_TEMP_FILE > $PASSWD_FILE
-
-export LD_PRELOAD=/usr/lib/libnss_wrapper.so
-export NSS_WRAPPER_PASSWD=$PASSWD_FILE
-export NSS_WRAPPER_GROUP=/etc/group
+# Must be done at runtime because of the dynamic UID
+echo "ccs:x:$(id -u):$(id -g):Calendar and Contacts Server:/home/ccs:/bin/bash" >> /etc/passwd
 
 # Just get our conf file
 CCS_CONF_TEMP_FILE="/home/ccs/contrib/docker/caldavd.plist.template"