From 9436bd3c92c06de917e3ee8d2a5323e9b10e1dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 8 Apr 2020 22:15:21 +0200 Subject: [PATCH] ARROW-8316: [CI] Set docker-compose to use docker-cli instead of docker-py for building images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build cache sometimes works sometimes doesn't. The images pushed from the master branch were sometimes producing reusable layers, sometimes not. So the caching was working non-deterministically. The underlying issue is https://github.com/docker/compose/issues/883 Closes #6802 from kszucs/docker-compose-cli Authored-by: Krisztián Szűcs Signed-off-by: Krisztián Szűcs --- .github/workflows/cpp.yml | 2 ++ .github/workflows/cpp_cron.yml | 2 ++ .github/workflows/dev.yml | 4 ++++ .github/workflows/go.yml | 4 ++++ .github/workflows/integration.yml | 4 ++++ .github/workflows/java.yml | 4 ++++ .github/workflows/java_jni.yml | 4 ++++ .github/workflows/js.yml | 4 ++++ .github/workflows/python.yml | 4 ++++ .github/workflows/python_cron.yml | 4 ++++ .github/workflows/r.yml | 4 ++++ .github/workflows/ruby.yml | 4 ++++ .github/workflows/rust.yml | 4 ++++ 13 files changed, 48 insertions(+) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 2e673b9db9ef..6e8d82594060 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -32,6 +32,8 @@ on: - 'format/Flight.proto' env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 ARROW_ENABLE_TIMING_TESTS: OFF jobs: diff --git a/.github/workflows/cpp_cron.yml b/.github/workflows/cpp_cron.yml index 318dd794b930..bcd0607d02d2 100644 --- a/.github/workflows/cpp_cron.yml +++ b/.github/workflows/cpp_cron.yml @@ -30,6 +30,8 @@ on: 0 */12 * * * env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 ARROW_ENABLE_TIMING_TESTS: OFF jobs: diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 5919284363b5..89b272142aa5 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -22,6 +22,10 @@ on: push: pull_request: +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: lint: diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 10ea200cb48c..23ac7425f20d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -29,6 +29,10 @@ on: - 'ci/**' - 'go/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c0fc10ca8a3f..bcbd217901e6 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -41,6 +41,10 @@ on: - 'java/**' - 'format/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: conda-integration: diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index b1d43bfa46b7..79e030f1b8c7 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -35,6 +35,10 @@ on: - 'format/Flight.proto' - 'java/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index d855a69b667a..c31670c13542 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -31,6 +31,10 @@ on: - 'cpp/**' - 'java/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index d0632bdb3d0c..ddebe5b234ea 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -29,6 +29,10 @@ on: - 'ci/**' - 'js/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 82418e92dce3..943c42e9c5f8 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -31,6 +31,10 @@ on: - 'cpp/**' - 'python/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: ubuntu: diff --git a/.github/workflows/python_cron.yml b/.github/workflows/python_cron.yml index 26c5cd7dbd5e..41c905497c98 100644 --- a/.github/workflows/python_cron.yml +++ b/.github/workflows/python_cron.yml @@ -28,6 +28,10 @@ on: - cron: | 0 */12 * * * +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 5fe7fab9fcf8..d6b7b6490d74 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -39,6 +39,10 @@ on: - 'cpp/**' - 'r/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: ubuntu: name: AMD64 Ubuntu ${{ matrix.ubuntu }} R ${{ matrix.r }} diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ff6b726f430c..ef0df90cb1da 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -33,6 +33,10 @@ on: - 'c_glib/**' - 'ruby/**' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: ubuntu: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3d474889dd67..434185855603 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,6 +35,10 @@ on: - 'rust/**' - 'format/Flight.proto' +env: + DOCKER_BUILDKIT: 0 + COMPOSE_DOCKER_CLI_BUILD: 1 + jobs: debian: