From 42185ce203e5140852d0d864cef186c6407fe3a5 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:21:12 +0000 Subject: [PATCH 01/15] Add docker step --- .github/workflow/docker.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflow/docker.yml diff --git a/.github/workflow/docker.yml b/.github/workflow/docker.yml new file mode 100644 index 00000000..fed2ab7d --- /dev/null +++ b/.github/workflow/docker.yml @@ -0,0 +1,29 @@ +name: ci + +on: + push: + branches: + - 'master' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v5 + with: + push: true + tags: lcd1232/bitcoind:latest From fce1067d74c857a3261c10640a13e17a2ab0d968 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:22:42 +0000 Subject: [PATCH 02/15] Fix folder name --- .github/{workflow => workflows}/docker.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflow => workflows}/docker.yml (100%) diff --git a/.github/workflow/docker.yml b/.github/workflows/docker.yml similarity index 100% rename from .github/workflow/docker.yml rename to .github/workflows/docker.yml From 36bb78834163ba335d23d4cfa367b4db14a221ea Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Sat, 6 Apr 2024 11:28:20 +0000 Subject: [PATCH 03/15] Add arm64 support --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fed2ab7d..9376634f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,4 +26,5 @@ jobs: uses: docker/build-push-action@v5 with: push: true + platforms: linux/amd64,linux/arm64 tags: lcd1232/bitcoind:latest From 47fa30b036f02c57a4045c9286562a226bf2fa98 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 06:53:45 +0000 Subject: [PATCH 04/15] Include more platforms --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9376634f..f90b8b8e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,5 +26,5 @@ jobs: uses: docker/build-push-action@v5 with: push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/armhf, linux/arm tags: lcd1232/bitcoind:latest From 017cf7b5e6f1028aecbcdf78dbddce9221630557 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 06:59:36 +0000 Subject: [PATCH 05/15] Add autotag logic --- .github/workflows/{docker.yml => publish.yml} | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) rename .github/workflows/{docker.yml => publish.yml} (60%) diff --git a/.github/workflows/docker.yml b/.github/workflows/publish.yml similarity index 60% rename from .github/workflows/docker.yml rename to .github/workflows/publish.yml index f90b8b8e..2ef3654e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: ci +name: publish on: push: @@ -21,10 +21,19 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + + - + name: Extract version from Dockerfile + run: | + VERSION=$(grep -oP '(?<=ARG VERSION=).*' Dockerfile) + echo "::set-env name=DOCKER_TAG::$VERSION" + - name: Build and push uses: docker/build-push-action@v5 with: push: true - platforms: linux/amd64,linux/arm64,linux/armhf, linux/arm - tags: lcd1232/bitcoind:latest + platforms: linux/amd64,linux/arm64,linux/armhf,linux/arm + tags: | + lcd1232/bitcoind:${{ env.DOCKER_TAG }} + lcd1232/bitcoind:latest From bc9782e5958f8301e370b00992e8f36605aa0133 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:24:59 +0000 Subject: [PATCH 06/15] Add checkout step --- .github/workflows/publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2ef3654e..3f8f9ead 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,6 +9,10 @@ jobs: docker: runs-on: ubuntu-latest steps: + - + name: Checkout + uses: actions/checkout@v4 + - name: Set up QEMU uses: docker/setup-qemu-action@v3 From 9caa066fb58a54ab052b292fd3fb490bdb7f5b22 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:27:54 +0000 Subject: [PATCH 07/15] Update logic --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3f8f9ead..ee0e7c67 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,9 +28,10 @@ jobs: - name: Extract version from Dockerfile + id: extract_version run: | VERSION=$(grep -oP '(?<=ARG VERSION=).*' Dockerfile) - echo "::set-env name=DOCKER_TAG::$VERSION" + echo "docker_tag=$VERSION" >> $GITHUB_ENV - name: Build and push @@ -39,5 +40,5 @@ jobs: push: true platforms: linux/amd64,linux/arm64,linux/armhf,linux/arm tags: | - lcd1232/bitcoind:${{ env.DOCKER_TAG }} + lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }} lcd1232/bitcoind:latest From dc20f9fc5de638dcc097242669b772dbb2e649e4 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:34:13 +0000 Subject: [PATCH 08/15] Remove newlines --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ee0e7c67..80d77444 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,6 +31,8 @@ jobs: id: extract_version run: | VERSION=$(grep -oP '(?<=ARG VERSION=).*' Dockerfile) + # Remove trailing whitespace or newline characters + VERSION=$(echo $VERSION | tr -d '\r\n') echo "docker_tag=$VERSION" >> $GITHUB_ENV - From ce213d09d249f0f9bb2766d1a388ccf9204d0dd0 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:35:45 +0000 Subject: [PATCH 09/15] Add brackets --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 80d77444..d14426d3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,5 +42,5 @@ jobs: push: true platforms: linux/amd64,linux/arm64,linux/armhf,linux/arm tags: | - lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }} - lcd1232/bitcoind:latest + "lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }}" + "lcd1232/bitcoind:latest" From 85d1ad4b74a4d03af19335f3b5ca4751bcf2b6db Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:38:20 +0000 Subject: [PATCH 10/15] Add debug message --- .github/workflows/publish.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d14426d3..b9d187e0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -33,6 +33,7 @@ jobs: VERSION=$(grep -oP '(?<=ARG VERSION=).*' Dockerfile) # Remove trailing whitespace or newline characters VERSION=$(echo $VERSION | tr -d '\r\n') + echo "version is $VERSION" echo "docker_tag=$VERSION" >> $GITHUB_ENV - @@ -41,6 +42,4 @@ jobs: with: push: true platforms: linux/amd64,linux/arm64,linux/armhf,linux/arm - tags: | - "lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }}" - "lcd1232/bitcoind:latest" + tags: lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }},lcd1232/bitcoind:latest From 1a6ea4c7a058147d07ff6c4e0ebecc2acc0d32f4 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:44:37 +0000 Subject: [PATCH 11/15] Add debug step --- .github/workflows/publish.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b9d187e0..53f6e502 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,6 +35,12 @@ jobs: VERSION=$(echo $VERSION | tr -d '\r\n') echo "version is $VERSION" echo "docker_tag=$VERSION" >> $GITHUB_ENV + + - + name: Debug + run: | + echo ${{ steps.extract_version.outputs.docker_tag }} + echo "lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }}" - name: Build and push From fd5c6fb2f679148484bf369f34f191c513e600e9 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:48:18 +0000 Subject: [PATCH 12/15] Fix issue with version --- .github/workflows/publish.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 53f6e502..699a0216 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,13 +34,7 @@ jobs: # Remove trailing whitespace or newline characters VERSION=$(echo $VERSION | tr -d '\r\n') echo "version is $VERSION" - echo "docker_tag=$VERSION" >> $GITHUB_ENV - - - - name: Debug - run: | - echo ${{ steps.extract_version.outputs.docker_tag }} - echo "lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }}" + echo "docker_tag=$VERSION" >> $GITHUB_OUTPUT - name: Build and push @@ -48,4 +42,6 @@ jobs: with: push: true platforms: linux/amd64,linux/arm64,linux/armhf,linux/arm - tags: lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }},lcd1232/bitcoind:latest + tags: | + lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }} + lcd1232/bitcoind:latest From 8e27e085039ef8c847334604b19f5dc6736a034c Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:50:10 +0000 Subject: [PATCH 13/15] Remove some platforms --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 699a0216..75048704 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,7 +41,7 @@ jobs: uses: docker/build-push-action@v5 with: push: true - platforms: linux/amd64,linux/arm64,linux/armhf,linux/arm + platforms: linux/amd64,linux/arm64 tags: | lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }} lcd1232/bitcoind:latest From dc74f3bf453cc3e478f9278704337c9b409979c8 Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:50:42 +0000 Subject: [PATCH 14/15] Remove unneeded logic --- .github/workflows/publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 75048704..fcfa7b99 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,8 +31,6 @@ jobs: id: extract_version run: | VERSION=$(grep -oP '(?<=ARG VERSION=).*' Dockerfile) - # Remove trailing whitespace or newline characters - VERSION=$(echo $VERSION | tr -d '\r\n') echo "version is $VERSION" echo "docker_tag=$VERSION" >> $GITHUB_OUTPUT From f63ccde018dc9f438f80c2517e16c5f1f331b2cd Mon Sep 17 00:00:00 2001 From: lcd1232 <8745863+lcd1232@users.noreply.github.com> Date: Thu, 11 Apr 2024 08:17:27 +0000 Subject: [PATCH 15/15] Update tag --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fcfa7b99..13b53493 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,5 +41,5 @@ jobs: push: true platforms: linux/amd64,linux/arm64 tags: | - lcd1232/bitcoind:${{ steps.extract_version.outputs.docker_tag }} - lcd1232/bitcoind:latest + kylemanna/bitcoind:${{ steps.extract_version.outputs.docker_tag }} + kylemanna/bitcoind:latest