Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit ed25b2a

Browse files
author
CI
committed
Automated update for script library changes
1 parent 1c845ff commit ed25b2a

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

containers/azure-ansible/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/azure-terraform/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/codespaces-linux/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/dapr-dotnet/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/dapr-javascript-node/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/docker-from-docker-compose/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/docker-from-docker/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

containers/kubernetes-helm/.devcontainer/library-scripts/docker-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
283283
# that we can set permissions on it without affecting the host.
284284
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
285285
SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
286-
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ]; then
286+
if [ "\${SOCKET_GID}" != "0" ] && [ "\${SOCKET_GID}" != "${DOCKER_GID}" ] && ! grep -E ".+:x:\${SOCKET_GID}" /etc/group; then
287287
sudoIf groupmod --gid "\${SOCKET_GID}" docker
288288
else
289289
# Enable proxy if not already running

0 commit comments

Comments
 (0)