From 82fe56c08d9f8285ef738a36c24fe7c2b37960c7 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 4 Jan 2024 18:09:07 +0800 Subject: [PATCH 1/5] fix: tags should be multiline Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 5f51f0d47..535618f59 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -41,7 +41,7 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} - tags: + tags: | type=match,pattern=\d.\d.\d type=sha - From c282a3daa871b14ce05705f012a24dcb70f11ee8 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 4 Jan 2024 18:11:41 +0800 Subject: [PATCH 2/5] chore: remove sha tag prefix Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 535618f59..59371e744 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -43,7 +43,7 @@ jobs: images: ${{ env.REGISTRY_IMAGE }} tags: | type=match,pattern=\d.\d.\d - type=sha + type=sha,prefix= - name: Set up QEMU uses: docker/setup-qemu-action@v3 From fa0d7e87b95de2316f41da95f60e1016a17d05fe Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 4 Jan 2024 18:30:45 +0800 Subject: [PATCH 3/5] fix: push by labels in matrix stage Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 59371e744..8d368bd21 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -41,9 +41,6 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} - tags: | - type=match,pattern=\d.\d.\d - type=sha,prefix= - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -64,7 +61,7 @@ jobs: context: . file: ./deployments/Dockerfile platforms: ${{ matrix.platform }} - tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true build-args: | RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-58224661' }} @@ -105,6 +102,9 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} + tags: | + type=match,pattern=\d.\d.\d + type=sha,prefix= - name: Login to Docker Hub uses: docker/login-action@v3 From a68054f42d80bff8fb8c4ec6dcd4803845dfa3a5 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 4 Jan 2024 18:35:52 +0800 Subject: [PATCH 4/5] chore: enable arm64 build Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 8d368bd21..a505b86f4 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -25,7 +25,7 @@ jobs: matrix: platform: - linux/amd64 - # - linux/arm64 + - linux/arm64 steps: - name: Prepare From 5ce5e2ac9617da00886bec8407d00be26b81c1f7 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Fri, 5 Jan 2024 13:43:48 +0800 Subject: [PATCH 5/5] fix: update buildpack/runtime tag to 16.20.2-35fe7e39 Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index a505b86f4..0d46e9e88 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -8,11 +8,11 @@ on: runtime: description: 'Runtime image' required: true - default: 'hackmdio/runtime:16.20.2-58224661' + default: 'hackmdio/runtime:16.20.2-35fe7e39' buildpack: description: 'Buildpack image' required: true - default: 'hackmdio/buildpack:16.20.2-58224661' + default: 'hackmdio/buildpack:16.20.2-35fe7e39' env: REGISTRY_IMAGE: hackmdio/hackmd @@ -64,8 +64,8 @@ jobs: labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true build-args: | - RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-58224661' }} - BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-58224661' }} + RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-35fe7e39' }} + BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-35fe7e39' }} - name: Export digest run: |