Remove dind in ci tests (#8529) (#8534)

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