From a5a59f18e58abb0f930cb04cabf3775138ae95c0 Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Wed, 4 May 2022 08:57:51 -0300 Subject: [PATCH] Revert "Remove dind in ci tests (#8529)" (#8547) This reverts commit 4cc0099eeefe7d0bfdf2e8db5955e78c229948d6. --- build/run-in-docker.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index ee6c49a04..315756269 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -62,7 +62,10 @@ else PLATFORM_FLAG= fi -docker run \ +if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then + /bin/bash -c "${FLAGS}" +else + docker run \ ${PLATFORM_FLAG} ${PLATFORM} \ --tty \ --rm \ @@ -78,3 +81,4 @@ docker run \ -w "/go/src/${PKG}" \ -u $(id -u ${USER}):$(id -g ${USER}) \ ${E2E_IMAGE} /bin/bash -c "${FLAGS}" +fi