aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-x[-rw-r--r--]test/docker-in-docker/docker_build.sh3
-rwxr-xr-xtest/docker-in-docker/docker_build_no_compose.sh16
-rw-r--r--test/docker-in-docker/scenarios.json10
-rwxr-xr-x[-rw-r--r--]test/docker-outside-of-docker/docker_build.sh2
-rwxr-xr-xtest/docker-outside-of-docker/docker_build_no_compose.sh15
-rwxr-xr-xtest/docker-outside-of-docker/docker_dash_compose_v2.sh2
-rw-r--r--test/docker-outside-of-docker/scenarios.json9
7 files changed, 57 insertions, 0 deletions
diff --git a/test/docker-in-docker/docker_build.sh b/test/docker-in-docker/docker_build.sh
index 742b222..d51e7d6 100644..100755
--- a/test/docker-in-docker/docker_build.sh
+++ b/test/docker-in-docker/docker_build.sh
@@ -9,5 +9,8 @@ source dev-container-features-test-lib
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
diff --git a/test/docker-in-docker/docker_build_no_compose.sh b/test/docker-in-docker/docker_build_no_compose.sh
new file mode 100755
index 0000000..e913be3
--- /dev/null
+++ b/test/docker-in-docker/docker_build_no_compose.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "not installing compose skips docker-compose v1 install" bash -c "! type docker-compose"
+check "not installing compose skips compose-switch" bash -c "[[ ! -f /usr/local/bin/compose-switch ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 5123d09..9c44478 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -58,5 +58,15 @@
}
},
"remoteUser": "node"
+ },
+ "docker_build_no_compose": {
+ "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+ "features": {
+ "docker-in-docker": {
+ "dockerDashComposeVersion": "none"
+ }
+ },
+ "remoteUser": "node"
}
+
}
diff --git a/test/docker-outside-of-docker/docker_build.sh b/test/docker-outside-of-docker/docker_build.sh
index 742b222..056a764 100644..100755
--- a/test/docker-outside-of-docker/docker_build.sh
+++ b/test/docker-outside-of-docker/docker_build.sh
@@ -9,5 +9,7 @@ source dev-container-features-test-lib
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
diff --git a/test/docker-outside-of-docker/docker_build_no_compose.sh b/test/docker-outside-of-docker/docker_build_no_compose.sh
new file mode 100755
index 0000000..477bf21
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_no_compose.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "not installing compose skips docker-compose v1 install" bash -c "! type docker-compose"
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v2.sh b/test/docker-outside-of-docker/docker_dash_compose_v2.sh
index 8f2a104..b24238f 100755
--- a/test/docker-outside-of-docker/docker_dash_compose_v2.sh
+++ b/test/docker-outside-of-docker/docker_dash_compose_v2.sh
@@ -9,5 +9,7 @@ source dev-container-features-test-lib
check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
# Report result
reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index be63470..3b82c6c 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -115,5 +115,14 @@
}
},
"containerUser": "vscode"
+ },
+ "docker_build_no_compose": {
+ "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+ "features": {
+ "docker-in-docker": {
+ "dockerDashComposeVersion": "none"
+ }
+ },
+ "remoteUser": "node"
}
}