Skip to content

Commit 7e79648

Browse files
Multi Arch Support
1 parent d76351a commit 7e79648

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.github/workflows/build-n-push.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@ jobs:
3838
- name: Log into GitHub Container Registry
3939
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
4040

41-
- name: Build Image
42-
run: IMAGE_REGISTRY="${{ env.IMAGE_REGISTRY }}" make docker-build
43-
44-
- name: Push Image
45-
run: IMAGE_REGISTRY="${{ env.IMAGE_REGISTRY }}" make docker-push
41+
- name: Build and Push Image
42+
run: IMAGE_REGISTRY="${{ env.IMAGE_REGISTRY }}" make docker-build-push
4643

4744
- name: Print Image Path
4845
id: print-docker-image-path
49-
run: echo IMAGE_PATH=`IMAGE_REGISTRY="${{ env.IMAGE_REGISTRY }}" make print-docker-image-path` >> $GITHUB_OUTPUT
46+
run: echo IMAGE_PATH=`IMAGE_REGISTRY="${{ env.IMAGE_REGISTRY }}" make print-docker-image-path` >> $GITHUB_OUTPUT

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ build: cmd/server/main.go
4646
go build -ldflags $(LDFLAGS) -mod vendor -o dist/provider ./cmd/server/main.go
4747

4848
docker-build:
49-
docker build -t ${IMAGE_PATH} -f build/Dockerfile .
49+
docker buildx build --platform=linux/amd64,linux/arm64 -t ${IMAGE_PATH} -f build/Dockerfile .
5050
# docker buildx build --platform=linux/amd64 -t ${IMAGE_PATH} -f build/Dockerfile .
5151

5252
docker-push:
5353
docker push ${IMAGE_PATH}
5454

55-
docker-build-push: docker-build
56-
docker push ${IMAGE_PATH}
55+
docker-build-push:
56+
docker buildx build --push --platform=linux/amd64,linux/arm64 -t ${IMAGE_PATH} -f build/Dockerfile .
5757

5858
print-docker-image-path:
5959
@echo ${IMAGE_PATH}
6060

6161
test-coverage:
6262
go test -coverprofile=cover.out ./…
63-
go tool cover -html=cover.out
63+
go tool cover -html=cover.out

0 commit comments

Comments
 (0)