From 7755601a8137018a9c8f172804a473e16acc107c Mon Sep 17 00:00:00 2001 From: josh Date: Fri, 22 Sep 2023 12:58:31 +0000 Subject: [PATCH 1/5] Update Actions Workflow to Push to registry.dangerous.tech Fixes #10 --- .github/workflows/docker-image.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ee4dbe5..aad5056 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,30 +4,35 @@ on: pull_request: push: branches: - - 'main' + - "main" jobs: docker: runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 + - name: Login to Registry + id: registry_push + uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} - - name: Build and push + - name: Build and Push id: docker_build uses: docker/build-push-action@v2 with: + context: . push: true - tags: dangeroustech/zerotierbridge:latest - + tags: DangerousTech/ZeroTierBridge:latest + - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} From 3b29bee4c642cf04c3af89a7c16f004531f83622 Mon Sep 17 00:00:00 2001 From: josh Date: Fri, 22 Sep 2023 13:00:14 +0000 Subject: [PATCH 2/5] fix: ci: use correct registry --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index aad5056..769af6a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -23,6 +23,7 @@ jobs: id: registry_push uses: docker/login-action@v1 with: + registry: registry.dangerous.tech username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_PASSWORD }} From fc24b78d4a1046ebc2b01560ed4b67e33418c30e Mon Sep 17 00:00:00 2001 From: josh Date: Fri, 22 Sep 2023 13:03:36 +0000 Subject: [PATCH 3/5] fix: ci: lowercase tag names --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 769af6a..b071ad3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,7 +33,7 @@ jobs: with: context: . push: true - tags: DangerousTech/ZeroTierBridge:latest + tags: dangeroustech/zerotierbridge:latest - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} From f461592cbf4a2e48ac6724e5e6214214d5a82492 Mon Sep 17 00:00:00 2001 From: josh Date: Fri, 22 Sep 2023 13:11:59 +0000 Subject: [PATCH 4/5] chore: update dep versions --- .github/workflows/docker-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b071ad3..7b79d31 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,14 +14,14 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to Registry id: registry_push - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: registry.dangerous.tech username: ${{ secrets.REGISTRY_USERNAME }} @@ -29,7 +29,7 @@ jobs: - name: Build and Push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . push: true From 3a5eb50b13cf7cab7939c4b49c14093189aae330 Mon Sep 17 00:00:00 2001 From: josh Date: Fri, 22 Sep 2023 13:13:59 +0000 Subject: [PATCH 5/5] fix: ci: use full registry name --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 7b79d31..6de70f1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,7 +33,7 @@ jobs: with: context: . push: true - tags: dangeroustech/zerotierbridge:latest + tags: registry.dangerous.tech/dangeroustech/zerotierbridge:latest - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }}