Unverified Commit a8dc2dbb authored by Samruddhi Khandale's avatar Samruddhi Khandale Committed by GitHub

Docker: Unpin "mobyBuildxVersion" (#877)

parent 758b0322
{ {
"id": "docker-in-docker", "id": "docker-in-docker",
"version": "2.9.1", "version": "2.9.2",
"name": "Docker (Docker-in-Docker)", "name": "Docker (Docker-in-Docker)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
"description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.", "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
}, },
"mobyBuildxVersion": { "mobyBuildxVersion": {
"type": "string", "type": "string",
"default": "0.12.0", "default": "latest",
"description": "Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version)" "description": "Install a specific version of moby-buildx when using Moby"
}, },
"dockerDashComposeVersion": { "dockerDashComposeVersion": {
"type": "string", "type": "string",
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
USE_MOBY="${MOBY:-"true"}" USE_MOBY="${MOBY:-"true"}"
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}" MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}" AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}" DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
...@@ -228,11 +228,13 @@ else ...@@ -228,11 +228,13 @@ else
# Install engine # Install engine
set +e # Handle error gracefully set +e # Handle error gracefully
apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx${buildx_version_suffix} moby-engine${engine_version_suffix} apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx${buildx_version_suffix} moby-engine${engine_version_suffix}
if [ $? -ne 0 ]; then exit_code=$?
err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')." set -e
exit 1
fi if [ ${exit_code} -ne 0 ]; then
set -e err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
exit 1
fi
# Install compose # Install compose
apt-get -y install --no-install-recommends moby-compose || err "Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping." apt-get -y install --no-install-recommends moby-compose || err "Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
......
{ {
"id": "docker-outside-of-docker", "id": "docker-outside-of-docker",
"version": "1.4.1", "version": "1.4.2",
"name": "Docker (docker-outside-of-docker)", "name": "Docker (docker-outside-of-docker)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
"description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.", "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
}, },
"mobyBuildxVersion": { "mobyBuildxVersion": {
"type": "string", "type": "string",
"default": "0.12.0", "default": "latest",
"description": "Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version)" "description": "Install a specific version of moby-buildx when using Moby"
}, },
"dockerDashComposeVersion": { "dockerDashComposeVersion": {
"type": "string", "type": "string",
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
DOCKER_VERSION="${VERSION:-"latest"}" DOCKER_VERSION="${VERSION:-"latest"}"
USE_MOBY="${MOBY:-"true"}" USE_MOBY="${MOBY:-"true"}"
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}" MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}" ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
......
#!/bin/bash
set -e
# Optional: Import test library
source dev-container-features-test-lib
# Definition specific tests
check "moby-buildx" bash -c "dpkg-query -W moby-buildx | grep -E '0.12.0'"
check "docker-buildx" bash -c "docker buildx version"
check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
check "docker-buildx" docker buildx version
check "docker-build" docker build ./
check "installs docker-compose v1 install" bash -c "type docker-compose"
check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
# Report result
reportResults
...@@ -98,6 +98,14 @@ ...@@ -98,6 +98,14 @@
} }
} }
}, },
"docker_specific_moby_buildx": {
"image": "ubuntu:focal",
"features": {
"docker-in-docker": {
"mobyBuildxVersion": "0.12.0"
}
}
},
// DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
"docker_with_on_create_command": { "docker_with_on_create_command": {
"image": "mcr.microsoft.com/devcontainers/base:debian", "image": "mcr.microsoft.com/devcontainers/base:debian",
......
...@@ -12,6 +12,7 @@ check "docker-ps" bash -c "docker ps" ...@@ -12,6 +12,7 @@ check "docker-ps" bash -c "docker ps"
check "log-exists" bash -c "ls /tmp/dockerd.log" check "log-exists" bash -c "ls /tmp/dockerd.log"
check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'" check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'" check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
check "moby-buildx" bash -c "dpkg-query -W moby-buildx"
# Report result # Report result
reportResults reportResults
\ No newline at end of file
#!/bin/bash
set -e
# Optional: Import test library
source dev-container-features-test-lib
# Definition specific tests
check "moby-buildx" bash -c "dpkg-query -W moby-buildx | grep -E '0.12.0'"
check "docker-buildx" bash -c "docker buildx version"
check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
check "docker-buildx" docker buildx version
check "docker-build" docker build ./
check "installs docker-compose v1 install" bash -c "type docker-compose"
# Report result
reportResults
...@@ -124,5 +124,13 @@ ...@@ -124,5 +124,13 @@
} }
}, },
"remoteUser": "node" "remoteUser": "node"
},
"docker_specific_moby_buildx": {
"image": "ubuntu:focal",
"features": {
"docker-outside-of-docker": {
"mobyBuildxVersion": "0.12.0"
}
}
} }
} }
...@@ -10,6 +10,7 @@ check "docker compose" bash -c "docker compose version" ...@@ -10,6 +10,7 @@ check "docker compose" bash -c "docker compose version"
check "docker-compose" bash -c "docker-compose --version" check "docker-compose" bash -c "docker-compose --version"
check "docker-ps" bash -c "docker ps >/dev/null" check "docker-ps" bash -c "docker ps >/dev/null"
check "moby-buildx" bash -c "dpkg-query -W moby-buildx"
# Report result # Report result
reportResults reportResults
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment