fix: clean up logic and only apply group if needed

Change group id to not conflict with host common id

Fix #13

Dockerfile

@@ -2,7 +2,8 @@ FROM library/docker:stable
 
 ENV HOME_DIR=/opt/crontab
 RUN apk add --no-cache --virtual .run-deps bash jq \
-    && mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects
+    && mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects \
+    && adduser -S docker -D
 
 COPY docker-entrypoint /
 ENTRYPOINT ["/docker-entrypoint"]
@@ -10,4 +11,4 @@ ENTRYPOINT ["/docker-entrypoint"]
 HEALTHCHECK --interval=5s --timeout=3s \
     CMD ps aux | grep '[c]rond' || exit 1
 
-CMD ["crond","-f"]
+CMD ["crond","-f"]

docker-entrypoint

@@ -22,6 +22,17 @@ CRONTAB_FILE=/etc/crontabs/docker
 # Ensure dir exist - in case of volume mapping
 mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects
 
+# Create docker group using correct gid from host, and add docker user to it
+if ! grep -q "^docker:" /etc/group; then
+	DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
+	if [ "${DOCKER_GID}" != "0" ]; then
+        addgroup -g ${DOCKER_GID} docker
+        adduser docker docker
+	else
+	    adduser docker root
+	fi
+fi
+
 slugify() {
     echo "$@" | iconv -t ascii | sed -r s/[~\^]+//g | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr A-Z a-z
 }

test_logging

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
+# This file is for testing the logging of docker output #8
+
 LOG_FILE=./jobs.log
 touch ${LOG_FILE}
 UUID="xxxxxxxxxxxxxxxxx"