diff options
Diffstat (limited to 'src/docker-from-docker')
| -rw-r--r-- | src/docker-from-docker/devcontainer-feature.json (renamed from src/docker-from-docker/feature.json) | 19 | ||||
| -rw-r--r-- | src/docker-from-docker/install.sh | 22 |
2 files changed, 24 insertions, 17 deletions
diff --git a/src/docker-from-docker/feature.json b/src/docker-from-docker/devcontainer-feature.json index ce955a7..f9c5d28 100644 --- a/src/docker-from-docker/feature.json +++ b/src/docker-from-docker/devcontainer-feature.json @@ -4,7 +4,11 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "none", "20.10"], + "proposals": [ + "latest", + "none", + "20.10" + ], "default": "latest", "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)" }, @@ -13,9 +17,12 @@ "default": true, "description": "Install OSS Moby build instead of Docker CE" }, - "dockerDashComposeVersion": { + "docker_dash_compose_version": { "type": "string", - "enum": ["v1", "v2" ], + "enum": [ + "v1", + "v2" + ], "default": "v1", "description": "Compose version to use for docker-compose (v1 or v2)" } @@ -29,9 +36,9 @@ ], "mounts": [ { - "source":"/var/run/docker.sock", - "target":"/var/run/docker-host.sock", - "type":"bind" + "source": "/var/run/docker.sock", + "target": "/var/run/docker-host.sock", + "type": "bind" } ], "install": { diff --git a/src/docker-from-docker/install.sh b/src/docker-from-docker/install.sh index 1102ae9..88ad52f 100644 --- a/src/docker-from-docker/install.sh +++ b/src/docker-from-docker/install.sh @@ -6,16 +6,16 @@ # # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md # Maintainer: The VS Code and Codespaces Teams -# -# Syntax: ./docker-debian.sh [enable non-root docker socket access flag] [source socket] [target socket] [non-root user] [use moby] [CLI version] [Major version for docker-compose] - -ENABLE_NONROOT_DOCKER=${1:-"true"} -SOURCE_SOCKET=${2:-"/var/run/docker-host.sock"} -TARGET_SOCKET=${3:-"/var/run/docker.sock"} -USERNAME=${4:-"automatic"} -USE_MOBY=${5:-"true"} -DOCKER_VERSION=${6:-"latest"} -DOCKER_DASH_COMPOSE_VERSION=${7:-"v1"} # v1 or v2 + +DOCKER_VERSION=${VERSION:-"latest"} +USE_MOBY=${MOBY:-"true"} +DOCKER_DASH_COMPOSE_VERSION=${DOCKER_DASH_COMPOSE_VERSION:-"v1"} # v1 or v2 + +ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"} +SOURCE_SOCKET=${SOURCE_SOCKET:-"/var/run/docker-host.sock"} +TARGET_SOCKET=${TARGET_SOCKET:-"/var/run/docker.sock"} +USERNAME=${USERNAME:-"automatic"} + MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy" DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy" @@ -31,7 +31,7 @@ fi if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") - for CURRENT_USER in ${POSSIBLE_USERS[@]}; do + for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} break |