From 460d334d21c3222729ccfa2d4cff1c26d5f6b2b1 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 24 Sep 2019 11:52:38 +0100 Subject: [PATCH] Copy logic from clsi entrypoint, to set permissions on docker.sock --- server-ce/runit/clsi-sharelatex/run | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server-ce/runit/clsi-sharelatex/run b/server-ce/runit/clsi-sharelatex/run index 7492acf6d1..539e5f2239 100755 --- a/server-ce/runit/clsi-sharelatex/run +++ b/server-ce/runit/clsi-sharelatex/run @@ -7,4 +7,13 @@ if [ "$DEBUG_NODE" == "true" ]; then NODE_PARAMS="--inspect=0.0.0.0:30130" fi +# Set permissions on docker.sock if present, +# To enable sibling-containers (see entrypoint.sh in clsi project) +if [ -e '/var/run/docker.sock' ]; then + echo ">> Setting permissions on docker socket" + DOCKER_GROUP=$(stat -c '%g' /var/run/docker.sock) + groupadd --non-unique --gid ${DOCKER_GROUP} dockeronhost + usermod -aG dockeronhost www-data +fi + exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /var/www/sharelatex/clsi/app.js >> /var/log/sharelatex/clsi.log 2>&1