fix empty build context

damoon · Dec 8, 2021 · 42a650e · 42a650e
1 parent 0f7fcc9
commit 42a650e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/cmd/d8s/main.go b/cmd/d8s/main.go
@@ -336,8 +336,9 @@ func executeCommand(args cli.Args, localAddr string) error {
 	cmd.Stdin = os.Stdin
 	cmd.Env = os.Environ()
 	cmd.Env = append(cmd.Env, "DOCKER_HOST=tcp://"+localAddr)
+	cmd.Env = append(cmd.Env, "DOCKER_BUILDKIT=0")
 
-	fmt.Printf("Execute command DOCKER_HOST=tcp://%s %v\n", localAddr, cmd)
+	fmt.Printf("Execute command DOCKER_HOST=tcp://%s DOCKER_BUILDKIT=0 %v\n", localAddr, cmd)
 
 	err := cmd.Run()
 	if err != nil {
@@ -419,8 +420,6 @@ func uploadContextHandlerFunc(proxy *httputil.ReverseProxy, localAddr string) ht
 			}
 		}
 
-		log.Println(chunksList.Bytes())
-
 		r.Body = io.NopCloser(bytes.NewReader(chunksList.Bytes()))
 		r.Header.Add("d8s-chunked", "true")
 

diff --git a/tests/docker-build.sh b/tests/docker-build.sh
@@ -1,6 +1,7 @@
 #!bash
 set -uexo pipefail
 export DOCKER_HOST=tcp://127.0.0.1:12376
+export DOCKER_BUILDKIT=0
 until docker version; do sleep 1; done
 
 docker build -t wedding-build-test-a -t wedding-build-test-b ./docker -f ./docker/dir/Dockerfile

diff --git a/tests/docker-inspect.sh b/tests/docker-inspect.sh
@@ -1,6 +1,7 @@
 #!bash
 set -uexo pipefail
 export DOCKER_HOST=tcp://127.0.0.1:12376
+export DOCKER_BUILDKIT=0
 until docker version; do sleep 1; done
 
 docker pull alpine

diff --git a/tests/docker-max-memory.sh b/tests/docker-max-memory.sh
@@ -1,6 +1,7 @@
 #!bash
 set -uexo pipefail
 export DOCKER_HOST=tcp://127.0.0.1:12376
+export DOCKER_BUILDKIT=0
 until docker version; do sleep 1; done
 
 docker build ./2gi-build

diff --git a/tests/docker-pull-tag-push.sh b/tests/docker-pull-tag-push.sh
@@ -1,6 +1,7 @@
 #!bash
 set -uexo pipefail
 export DOCKER_HOST=tcp://127.0.0.1:12376
+export DOCKER_BUILDKIT=0
 until docker version; do sleep 1; done
 
 docker pull alpine

diff --git a/tests/tilt-ci.sh b/tests/tilt-ci.sh
@@ -1,6 +1,7 @@
 #!bash
 set -uexo pipefail
 export DOCKER_HOST=tcp://127.0.0.1:12376
+export DOCKER_BUILDKIT=0
 until docker version; do sleep 1; done
 
 cd tilt