From 651d2c336d2934aa363171935bfd3c308680a2fb Mon Sep 17 00:00:00 2001 From: Yshayy Date: Mon, 1 Jun 2020 19:17:08 +0300 Subject: [PATCH 1/6] Update push.yaml --- .github/workflows/push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 1a00bde..66fc402 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -15,7 +15,7 @@ jobs: DOCKER_BUILDKIT: 1 DOCKER_CLI_EXPERIMENTAL: enabled working-directory: ./integration/docker - run: docker buildx bake -f ./docker-compose.base.yaml -f ./docker-compose.worker.yaml -f ./docker-compose.producer.yaml --load + run: docker buildx bake --set "dqd.cache-to=soluto/dqd:build-cache-dqd" --set "dqd.cache-from=soluto/dqd:build-cache-dqd" --set "worker.cache-to=soluto/dqd:build-cache-worker" --set "worker.cache-from=soluto/dqd:build-cache-worker" --set "producer.cache-to=soluto/dqd:build-cache-producer" --set "producer.cache-from=soluto/dqd:build-cache-producer" -f ./docker-compose.base.yaml -f ./docker-compose.worker.yaml -f ./docker-compose.producer.yaml --load - name: test-multi working-directory: ./integration/tests run: ./multi.sh @@ -39,4 +39,4 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} repository: soluto/dqd tag_with_sha: ${{ github.ref == 'refs/heads/master'}} - tag_with_ref: ${{ github.ref != 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') }} \ No newline at end of file + tag_with_ref: ${{ github.ref != 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') }} From b6c682095850e3289dbe1ccc495832ff0560a5fe Mon Sep 17 00:00:00 2001 From: Yshayy Date: Mon, 1 Jun 2020 19:18:19 +0300 Subject: [PATCH 2/6] Update push.yaml --- .github/workflows/push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 66fc402..308c21d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -15,7 +15,7 @@ jobs: DOCKER_BUILDKIT: 1 DOCKER_CLI_EXPERIMENTAL: enabled working-directory: ./integration/docker - run: docker buildx bake --set "dqd.cache-to=soluto/dqd:build-cache-dqd" --set "dqd.cache-from=soluto/dqd:build-cache-dqd" --set "worker.cache-to=soluto/dqd:build-cache-worker" --set "worker.cache-from=soluto/dqd:build-cache-worker" --set "producer.cache-to=soluto/dqd:build-cache-producer" --set "producer.cache-from=soluto/dqd:build-cache-producer" -f ./docker-compose.base.yaml -f ./docker-compose.worker.yaml -f ./docker-compose.producer.yaml --load + run: docker buildx create --use && docker buildx bake --set "dqd.cache-to=soluto/dqd:build-cache-dqd" --set "dqd.cache-from=soluto/dqd:build-cache-dqd" --set "worker.cache-to=soluto/dqd:build-cache-worker" --set "worker.cache-from=soluto/dqd:build-cache-worker" --set "producer.cache-to=soluto/dqd:build-cache-producer" --set "producer.cache-from=soluto/dqd:build-cache-producer" -f ./docker-compose.base.yaml -f ./docker-compose.worker.yaml -f ./docker-compose.producer.yaml --load - name: test-multi working-directory: ./integration/tests run: ./multi.sh From 72e05e25c95aa152e018432b576ee8d0ac6205a9 Mon Sep 17 00:00:00 2001 From: Yshayy Date: Mon, 1 Jun 2020 19:21:31 +0300 Subject: [PATCH 3/6] Update push.yaml --- .github/workflows/push.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 308c21d..158c814 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -10,6 +10,10 @@ jobs: - uses: actions/checkout@v2 - name: install latest buildx run: mkdir -p ~/.docker/cli-plugins && wget -O ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64 && chmod a+x ~/.docker/cli-plugins/docker-buildx + - uses: azure/docker-login@v1 + with: + username: solutodqd + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: build env: DOCKER_BUILDKIT: 1 From 562614366685f54105c4cb4f19da650c75080d4d Mon Sep 17 00:00:00 2001 From: Yshayy Date: Mon, 1 Jun 2020 19:23:04 +0300 Subject: [PATCH 4/6] Update push.yaml order --- .github/workflows/push.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 158c814..11a4b29 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -8,12 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: install latest buildx - run: mkdir -p ~/.docker/cli-plugins && wget -O ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64 && chmod a+x ~/.docker/cli-plugins/docker-buildx - uses: azure/docker-login@v1 with: username: solutodqd password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: install latest buildx + run: mkdir -p ~/.docker/cli-plugins && wget -O ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64 && chmod a+x ~/.docker/cli-plugins/docker-buildx + - name: build env: DOCKER_BUILDKIT: 1 From 112af92cd15d84facabc62024a690e681823d9d6 Mon Sep 17 00:00:00 2001 From: Yshayy Date: Mon, 1 Jun 2020 19:29:25 +0300 Subject: [PATCH 5/6] Update push.yaml another attempt at login --- .github/workflows/push.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 11a4b29..b8c769c 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -14,7 +14,10 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: install latest buildx run: mkdir -p ~/.docker/cli-plugins && wget -O ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64 && chmod a+x ~/.docker/cli-plugins/docker-buildx - + - name: login + env: + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + run: echo $DOCKERHUB_TOKEN | docker login --username solutodqd --password-stdin - name: build env: DOCKER_BUILDKIT: 1 From 69d96f462c0bde34378ca3ad4342dba9d23ca0b1 Mon Sep 17 00:00:00 2001 From: Yshayy Date: Mon, 1 Jun 2020 19:30:19 +0300 Subject: [PATCH 6/6] Update push.yaml --- .github/workflows/push.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index b8c769c..b082362 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -8,10 +8,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: azure/docker-login@v1 - with: - username: solutodqd - password: ${{ secrets.DOCKERHUB_TOKEN }} - name: install latest buildx run: mkdir -p ~/.docker/cli-plugins && wget -O ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64 && chmod a+x ~/.docker/cli-plugins/docker-buildx - name: login