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 /test/docker-in-docker/docker_build.sh | |
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 'test/docker-in-docker/docker_build.sh')
-rwxr-xr-x[-rw-r--r--] | test/docker-in-docker/docker_build.sh | 3 |
1 files changed, 3 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 |