diff options
| author | M. R <2947595+m-roberts@users.noreply.github.com> | 2023-05-02 22:00:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 22:00:45 +0300 |
| commit | 4312340798680a2b148847b124fcf737e5839c2e (patch) | |
| tree | 60685df52a1f8b197a78e0dffa553ccb0463ba4f /src/docker-outside-of-docker/devcontainer-feature.json | |
| parent | b16ff1efb7b092c73ab1e13c3d016d1ab7a9e4b6 (diff) | |
Add support for skipping `docker-compose` v1 operations during Docker feature install script (#533)feature_docker-outside-of-docker_1.3.0feature_docker-in-docker_2.2.0
* Add support for skipping docker-compose operations
* Move changes from auto-generated files to templates and bump version
* Add test
* Add test conditions
* Add test conditions for docker-outside-of-docker
* install.sh set -x for debugging
* set -x
* Move compose-switch check in docker-outside-of-docker test
* Put into correct test
* Test for correct path
Diffstat (limited to 'src/docker-outside-of-docker/devcontainer-feature.json')
| -rw-r--r-- | src/docker-outside-of-docker/devcontainer-feature.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json index 2b75aa4..d3123fa 100644 --- a/src/docker-outside-of-docker/devcontainer-feature.json +++ b/src/docker-outside-of-docker/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "docker-outside-of-docker", - "version": "1.2.1", + "version": "1.3.0", "name": "Docker (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.", @@ -23,11 +23,12 @@ "dockerDashComposeVersion": { "type": "string", "enum": [ + "none", "v1", "v2" ], "default": "v2", - "description": "Compose version to use for docker-compose (v1 or v2)" + "description": "Compose version to use for docker-compose (v1 or v2 or none)" }, "installDockerBuildx": { "type": "boolean", |