Allow to specify UID/GID for contributor container. Fixes #143.

Author: nickygerritsen

docker-contributor/Dockerfile

@@ -4,6 +4,8 @@ LABEL maintainer="DOMjudge team <[email protected]>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
   CONTAINER_TIMEZONE=Europe/Amsterdam \
+  UID=1000 \
+  GID=1000 \
   MYSQL_HOST=mariadb \
   MYSQL_USER=domjudge \
   MYSQL_DATABASE=domjudge \
@@ -43,7 +45,8 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log \
   && mkdir -p /run/php
 
 # Set up users
-RUN useradd -m domjudge \
+RUN groupadd -g $GID domjudge \
+  && useradd -u $UID -g $GID -m domjudge \
   && groupadd domjudge-run \
   && for id in $(seq 0 4); do useradd -d /nonexistent -g nogroup -s /bin/false "domjudge-run-$id"; done
 

docker-contributor/README.md

@@ -57,6 +57,8 @@ bin/dj_setup_database install-examples
 
 The following environment variables are supported by the container:
 
+* `UID` (defaults to `1000`): the ID of the user to run DOMjudge as. Should match the host OS user ID.
+* `GID` (defaults to `1000`): the ID of the group to run DOMjudge as. Should match the host OS group ID.
 * `CONTAINER_TIMEZONE` (defaults to `Europe/Amsterdam`): allows you to change the timezone used inside the container.
 * `MYSQL_HOST` (defaults to `mariadb`): set the host to connect to for MySQL. Can be hostname or IP. Docker will add hostnames for any containers you `--link`, so in the example above, the MariaDB container will be available under the hostname `mariadb`.
 * `MYSQL_USER` (defaults to `domjudge`): set the user to use for connecting to MySQL.

docker-contributor/scripts/start.sh

@@ -9,6 +9,11 @@ function file_or_env {
     fi
 }
 
+echo "[..] Changing user/group ID"
+groupmod -g "${GID}" domjudge
+usermod -u "${UID}" domjudge
+echo "[ok] User ID set to ${UID} and group ID set to ${GID}"; echo
+
 echo "[..] Setting timezone"
 sudo ln -snf "/usr/share/zoneinfo/${CONTAINER_TIMEZONE}" /etc/localtime
 echo "${CONTAINER_TIMEZONE}" | sudo tee /etc/timezone