From 50b307db02642d8191c7090ad33f165004b67e97 Mon Sep 17 00:00:00 2001 From: Shadowy Super Coder Date: Wed, 15 Jan 2025 14:52:29 -0700 Subject: [PATCH 1/2] add arm64 arch --- .github/workflows/ghcr.yml | 54 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index 1e8c099..ed808ce 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -1,7 +1,7 @@ name: ghcr ci env: - IMAGE_NAME: 'btc-rpc-proxy' + IMAGE_NAME: "btc-rpc-proxy" on: push: @@ -10,30 +10,30 @@ on: pull_request: [] jobs: - push-image: - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Build image - run: docker buildx build . --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" --load - - name: Log in to registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin + push-image: + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Build image + run: docker buildx build . --platform linux/amd64, linux/arm64 --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" --load + - name: Log in to registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - name: Push image - run: | - IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') - [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') - [ "$VERSION" == "master" ] && VERSION=latest - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $IMAGE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - - name: Clean up Docker images - run: docker image prune -f \ No newline at end of file + - name: Push image + run: | + IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME + IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') + VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') + [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') + [ "$VERSION" == "master" ] && VERSION=latest + echo IMAGE_ID=$IMAGE_ID + echo VERSION=$VERSION + docker tag $IMAGE_NAME $IMAGE_ID:$VERSION + docker push $IMAGE_ID:$VERSION + - name: Clean up Docker images + run: docker image prune -f From 84b6ce32e4a7aa5b6cc616dfd3445ff84073dd59 Mon Sep 17 00:00:00 2001 From: Shadowy Super Coder Date: Wed, 15 Jan 2025 14:59:02 -0700 Subject: [PATCH 2/2] remove space between arches --- .github/workflows/ghcr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index ed808ce..c78dfbf 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Build image - run: docker buildx build . --platform linux/amd64, linux/arm64 --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" --load + run: docker buildx build . --platform linux/amd64,linux/arm64 --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" --load - name: Log in to registry run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin