Skip to content

Commit 316cc91

Browse files
committed
Update release.yml
1 parent ad1f853 commit 316cc91

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

.github/workflows/release.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,18 @@ jobs:
5353
password: ${{ secrets.GITHUB_TOKEN }}
5454

5555
- name: Build and push AMD64 image
56-
run: |
57-
docker buildx build . \
58-
--platform linux/amd64 \
59-
--tag $REGISTRY/$ORG/$IMAGE_NAME:$IMAGE_TAG-amd64 \
60-
--build-arg RUST_VERSION=$RUST_VERSION \
61-
--build-arg CARGO_COMPONENT_VERSION=$CARGO_COMPONENT_VERSION \
62-
--build-arg WASM_TOOLS_VERSION=$WASM_TOOLS_VERSION \
63-
--build-arg WKG_VERSION=$WKG_VERSION \
64-
--push \
65-
-f $DOCKERFILE
56+
uses: docker/build-push-action@v5
57+
with:
58+
context: .
59+
file: ${{ env.DOCKERFILE }}
60+
platforms: linux/amd64
61+
push: true
62+
tags: ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}-amd64
63+
build-args: |
64+
RUST_VERSION=${{ env.RUST_VERSION }}
65+
CARGO_COMPONENT_VERSION=${{ env.CARGO_COMPONENT_VERSION }}
66+
WASM_TOOLS_VERSION=${{ env.WASM_TOOLS_VERSION }}
67+
WKG_VERSION=${{ env.WKG_VERSION }}
6668
6769
build_arm64:
6870
name: Build and Push ARM64 Image
@@ -105,16 +107,18 @@ jobs:
105107
password: ${{ secrets.GITHUB_TOKEN }}
106108

107109
- name: Build and push ARM64 image
108-
run: |
109-
docker buildx build . \
110-
--platform linux/arm64 \
111-
--tag $REGISTRY/$ORG/$IMAGE_NAME:$IMAGE_TAG-arm64 \
112-
--build-arg RUST_VERSION=$RUST_VERSION \
113-
--build-arg CARGO_COMPONENT_VERSION=$CARGO_COMPONENT_VERSION \
114-
--build-arg WASM_TOOLS_VERSION=$WASM_TOOLS_VERSION \
115-
--build-arg WKG_VERSION=$WKG_VERSION \
116-
--push \
117-
-f $DOCKERFILE
110+
uses: docker/build-push-action@v5
111+
with:
112+
context: .
113+
file: ${{ env.DOCKERFILE }}
114+
platforms: linux/arm64
115+
push: true
116+
tags: ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}-arm64
117+
build-args: |
118+
RUST_VERSION=${{ env.RUST_VERSION }}
119+
CARGO_COMPONENT_VERSION=${{ env.CARGO_COMPONENT_VERSION }}
120+
WASM_TOOLS_VERSION=${{ env.WASM_TOOLS_VERSION }}
121+
WKG_VERSION=${{ env.WKG_VERSION }}
118122
119123
create_manifest:
120124
name: Create and Push Multi-Arch Manifest
@@ -147,11 +151,6 @@ jobs:
147151
fi
148152
echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
149153
150-
- name: Set GIT_HASH
151-
run: |
152-
export GIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
153-
echo "GIT_HASH=${GIT_HASH}" >> $GITHUB_ENV
154-
155154
- name: Set up Docker Buildx
156155
uses: docker/setup-buildx-action@v3
157156

@@ -164,6 +163,7 @@ jobs:
164163

165164
- name: Create and push multi-arch manifest
166165
run: |
166+
export GIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
167167
docker buildx imagetools create \
168168
--tag $REGISTRY/$ORG/$IMAGE_NAME:$IMAGE_TAG \
169169
--tag $REGISTRY/$ORG/$IMAGE_NAME:$GIT_HASH \

0 commit comments

Comments
 (0)