This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 36de35a ARROW-8707: [CI] Docker push fails because of wrong dockerhub
credentials
36de35a is described below
commit 36de35aff16ad1f77c4dd7144136a22490c84cd6
Author: Krisztián Szűcs <[email protected]>
AuthorDate: Tue May 5 20:59:19 2020 +0200
ARROW-8707: [CI] Docker push fails because of wrong dockerhub credentials
- fix rather bug copy-paste error
- adjust command sequence to pull all images before building
Closes #7109 from kszucs/archery-docker-push
Authored-by: Krisztián Szűcs <[email protected]>
Signed-off-by: Krisztián Szűcs <[email protected]>
---
.github/workflows/cpp.yml | 4 ++--
.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 ++--
dev/archery/archery/docker.py | 31 ++++++++++++++++++-------------
dev/archery/archery/tests/test_docker.py | 6 +++---
15 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 2c39aac..a04222a 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -41,8 +41,8 @@ env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
ARROW_ENABLE_TIMING_TESTS: OFF
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/cpp_cron.yml b/.github/workflows/cpp_cron.yml
index f4a7a86..a93484b 100644
--- a/.github/workflows/cpp_cron.yml
+++ b/.github/workflows/cpp_cron.yml
@@ -33,6 +33,8 @@ env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
ARROW_ENABLE_TIMING_TESTS: OFF
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 1100dda..6bdeb72 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -25,8 +25,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 94bf519..663a9db 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -35,8 +35,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/integration.yml
b/.github/workflows/integration.yml
index e82b06f..4fea799 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -44,8 +44,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index aa038d9..7f8af19 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -38,8 +38,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml
index 90b5172..ae257c5 100644
--- a/.github/workflows/java_jni.yml
+++ b/.github/workflows/java_jni.yml
@@ -38,8 +38,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 383326e..b12c229 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -34,8 +34,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 9817770..c7e5ea8 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -34,8 +34,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/python_cron.yml
b/.github/workflows/python_cron.yml
index db6c828..8334cce 100644
--- a/.github/workflows/python_cron.yml
+++ b/.github/workflows/python_cron.yml
@@ -31,8 +31,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index c5fcba8..7b8d354 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -42,8 +42,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 563394b..06bbb14 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -36,8 +36,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 01a13cc..db2f648 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -38,8 +38,8 @@ on:
env:
DOCKER_BUILDKIT: 0
COMPOSE_DOCKER_CLI_BUILD: 1
- ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_TOKEN }}
- ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
+ ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
jobs:
diff --git a/dev/archery/archery/docker.py b/dev/archery/archery/docker.py
index 42660cd..ca2237b 100644
--- a/dev/archery/archery/docker.py
+++ b/dev/archery/archery/docker.py
@@ -138,22 +138,27 @@ class DockerCompose(Command):
)
)
- def _pull_andor_build(self, image, pull_if):
- if pull_if:
- self._execute('pull', '--ignore-pull-failures', image)
- self._execute('build', image)
- else:
- self._execute('build', '--no-cache', image)
-
def build(self, image, cache=True, cache_leaf=True, params=None):
self._validate_image(image)
- # build each ancestors
- for ancestor in self.nodes[image]:
- self._pull_andor_build(ancestor, pull_if=cache)
-
- # build the image at last
- self._pull_andor_build(image, pull_if=(cache and cache_leaf))
+ if cache:
+ # pull
+ for ancestor in self.nodes[image]:
+ self._execute('pull', '--ignore-pull-failures', ancestor)
+ if cache_leaf:
+ self._execute('pull', '--ignore-pull-failures', image)
+ # build
+ for ancestor in self.nodes[image]:
+ self._execute('build', ancestor)
+ if cache_leaf:
+ self._execute('build', image)
+ else:
+ self._execute('build', '--no-cache', image)
+ else:
+ # build
+ for ancestor in self.nodes[image]:
+ self._execute('build', '--no-cache', ancestor)
+ self._execute('build', '--no-cache', image)
def run(self, image, command=None, env=None, params=None):
self._validate_image(image)
diff --git a/dev/archery/archery/tests/test_docker.py
b/dev/archery/archery/tests/test_docker.py
index 902234f..ce75d84 100644
--- a/dev/archery/archery/tests/test_docker.py
+++ b/dev/archery/archery/tests/test_docker.py
@@ -254,10 +254,10 @@ def test_compose_build(arrow_compose_path):
expected_calls = [
"pull --ignore-pull-failures conda-cpp",
- "build conda-cpp",
"pull --ignore-pull-failures conda-python",
- "build conda-python",
"pull --ignore-pull-failures conda-python-pandas",
+ "build conda-cpp",
+ "build conda-python",
"build conda-python-pandas"
]
with assert_compose_calls(compose, expected_calls):
@@ -273,8 +273,8 @@ def test_compose_build(arrow_compose_path):
expected_calls = [
"pull --ignore-pull-failures conda-cpp",
- "build conda-cpp",
"pull --ignore-pull-failures conda-python",
+ "build conda-cpp",
"build conda-python",
"build --no-cache conda-python-pandas",
]
