From 61c81bb5faacea7a839a6ef3e461357e7a6c5137 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 26 Aug 2022 12:39:27 -0400 Subject: [PATCH] switch to hybrid --- .../dependencies.d/init-mods | 0 .../init-mod-universal-docker-setup/run | 32 +++++++++++++++++++ .../init-mod-universal-docker-setup/type | 1 + .../init-mod-universal-docker-setup/up | 1 + .../init-mod-universal-docker-setup | 0 .../init-mod-universal-docker-setup | 0 6 files changed, 34 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-docker-setup create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-setup diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/run new file mode 100755 index 0000000..8138cbb --- /dev/null +++ b/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 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/type b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/up b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-setup/up new file mode 100644 index 0000000..171642a --- /dev/null +++ b/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 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-docker-setup b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-docker-setup new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-docker-setup new file mode 100644 index 0000000..e69de29