Merge pull request #476 from linuxserver/universal-docker-s6v3

switch to hybrid (universal-docker)

root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run

@@ -0,0 +1,32 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** installing docker and docker compose ****"
+ARCH=$(uname -m)
+if [ -d "/docker-bins" ] ; then
+  echo "Copying over docker and docker-compose binaries"
+  mkdir -p /usr/local/lib/docker/cli-plugins
+  mv "/docker-bins/docker-compose_${ARCH}" /usr/local/lib/docker/cli-plugins/docker-compose
+  mv "/docker-bins/docker_${ARCH}" /usr/local/bin/docker
+  mv "/docker-bins/compose-switch_${ARCH}" /usr/local/bin/docker-compose
+  rm -rf /docker-bins
+else
+  echo "**** docker and docker-compose already installed, skipping ****"
+fi
+
+if [ -S /var/run/docker.sock ]; then
+  DOCKER_GID=$(stat -c '%g' "/var/run/docker.sock")
+  if id -G abc | grep -qw "$DOCKER_GID"; then
+    exit 0
+  else
+    DOCKER_NAME=$(getent group "${DOCKER_GID}" | awk -F: '{print $1}')
+    if [ -z "${DOCKER_NAME}" ]; then
+      DOCKER_NAME="dockergroup"
+      groupadd -g "${DOCKER_GID}" "${DOCKER_NAME}"
+    fi
+    usermod -aG "${DOCKER_NAME}" abc
+  fi
+elif [ -n "$DOCKER_HOST" ]; then
+  echo "**** Remote docker service $DOCKER_HOST will be used ****"
+else
+  echo "**** Please map /var/run/docker.sock for access to docker service on host. Alternatively you can manually define a remote host address with the docker cli option -H ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run