Minor container startup tweaks.

Author: Alan-R

cma/cma.py

@@ -395,7 +395,10 @@ def main():
     cmainit.CMAInjectables.default_cma_injection_configuration()
     userinfo = pwd.getpwnam(opt.userid)
     os.chown(config.get("SQLiteFile"), userinfo.pw_uid, userinfo.pw_gid)
-    os.chown(config.get("SQLiteFile") + '-journal', userinfo.pw_uid, userinfo.pw_gid)
+    try:
+        os.chown(config.get("SQLiteFile") + '-journal', userinfo.pw_uid, userinfo.pw_gid)
+    except FileNotFoundError:
+        pass
     drop_privileges_permanently(opt.userid)
     try:
         cmainit.CMAinit(io, cleanoutdb=opt.erasedb, debug=(opt.debug > 0))

docker/cma/Dockerfile

@@ -72,5 +72,5 @@ RUN echo ${GENCMD}
 RUN ${GENCMD} 2>&1 | egrep -v '/usr/include/|Undef "NULL"'
 WORKDIR ${SRCDIR}/cma
 ADD startup.sh /root/startup.sh
-RUN mkdir -p /var/run
+RUN mkdir -p /var/run /usr/share/assimilation/notification.d
 CMD ["/root/startup.sh"]

docker/cma/debugme.sh

@@ -0,0 +1,16 @@
+VOLS="/var/lib/assimilation
+/var/run/assimilation
+/var/run/docker.sock
+/dev/log
+"
+VFLAGS=""
+for vol in $VOLS
+do
+  VFLAGS="$VFLAGS -v $vol:$vol"
+done
+uid=$(grep '^assimilation:' /etc/passwd | cut -d: -f3)
+gid=$(grep '^assimilation:' /etc/passwd | cut -d: -f4)
+EFLAGS=" -e ASSIM_UID=${uid} -e ASSIM_GID=${gid}"
+
+  
+docker run -t -i $VFLAGS $EFLAGS assimilationproject/cma:1.99.0 /bin/bash

docker/cma/startup.sh

@@ -1,6 +1,8 @@
 #!/bin/sh -eu
 : ${CMADEBUG=1}
 
+set -e
+
 critical() {
     echo "CRITICAL: $*" >&2
     result='BAD'
@@ -9,6 +11,18 @@ OWNERSHIP=assimilation:assimilation
 DEFAULT_MODE=0755
 shares="/dev/log /var/run/docker.sock /var/lib/assimilation /var/run/assimilation"
 
+make_user() {
+  if
+    grep '^assimilation:' /etc/passwd >/dev/null
+  then
+    : COOL!
+  else
+    addgroup --gid $ASSIM_GID assimilation
+    adduser --system --uid $ASSIM_UID --gid $ASSIM_GID --no-create-home assimilation
+  fi
+}
+
+
 fix_install() {
     result=OK
     for share in $shares
@@ -41,6 +55,7 @@ fix_install() {
             chown "${OWNERSHIP}" "${dir}"
         fi
     done
+    make_user
     chown $OWNERSHIP /usr/share/assimilation
     for file in /usr/share/assimilation assim_json.sqlite assim_json.sqlite-journal
     do