Revert "Remove dind in ci tests (kubernetes#8529) (kubernetes#8534)" (k…

…ubernetes#8546) This reverts commit 9e3dd4e.
bromine0x23 · May 4, 2022 · ca2f25e · ca2f25e
1 parent 9e3dd4e
commit ca2f25e
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
@@ -55,15 +55,10 @@ fi
 # create output directory as current user to avoid problem with docker.
 mkdir -p "${KUBE_ROOT}/bin" "${KUBE_ROOT}/bin/${ARCH}"
 
-PLATFORM="${PLATFORM:-}"
-if [[ -n "$PLATFORM" ]]; then
-  PLATFORM_FLAG=--platform
+if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
+  /bin/bash -c "${FLAGS}"
 else
-  PLATFORM_FLAG=
-fi
-
-docker run                                            \
-    ${PLATFORM_FLAG} ${PLATFORM}                        \
+  docker run                                            \
     --tty                                               \
     --rm                                                \
     ${DOCKER_OPTS}                                      \
@@ -78,3 +73,4 @@ docker run                                            \
     -w "/go/src/${PKG}"                                 \
     -u $(id -u ${USER}):$(id -g ${USER})                \
     ${E2E_IMAGE} /bin/bash -c "${FLAGS}"
+fi