Check the DID user is in the docker group

Signed-off-by: Elizabeth Byerly <ebyerly@google.com>

Author: ebyerly

ci/docker-compose.yml

@@ -97,6 +97,15 @@ x-envoy-build-base: &envoy-build-base
     chown envoybuild:envoybuild /build
     chown envoybuild /proc/self/fd/2 2>/dev/null || true
     [[ -e /entrypoint-extra.sh ]] && /entrypoint-extra.sh
+
+    if [ -S /var/run/docker.sock ]; then
+        DOCKER_GID=$(stat -c '%g' /var/run/docker.sock)
+        if ! getent group "$DOCKER_GID" >/dev/null; then
+            groupadd -g "$DOCKER_GID" docker_sock
+        fi
+        usermod -a -G "$(getent group "$DOCKER_GID" | cut -d: -f1)" envoybuild
+    fi
+
     sudo -EHs -u envoybuild bash -c 'cd ${ENVOY_DOCKER_SOURCE_DIR:-/source} && exec ${DOCKER_COMMAND:-bash}'
 
 services: