Skip to content

Commit a888e29

Browse files
authored
Merge pull request #39 from cert-manager/multi-arch-docker-images
multi-arch docker images
2 parents acb5e00 + a407cef commit a888e29

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/release.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
uses: actions/checkout@v2
1212
with:
1313
fetch-depth: 0
14+
1415
-
1516
name: Log in to GitHub Container Registry
1617
uses: docker/login-action@v1
@@ -20,10 +21,8 @@ jobs:
2021
password: ${{ secrets.GITHUB_TOKEN }}
2122
-
2223
name: Build Docker image
23-
run: make docker-build
24-
-
25-
name: Push Docker image
26-
run: make docker-push
24+
run: make docker-buildx
25+
2726
-
2827
name: Create install.yaml file
2928
run: make build/install.yaml

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ docker-push: ## Push docker image with the manager.
131131
# - have enable BuildKit, More info: https://docs.docker.com/develop/develop-images/build_enhancements/
132132
# - be able to push the image for your registry (i.e. if you do not inform a valid value via IMG=<myregistry/image:<tag>> then the export will fail)
133133
# To properly provided solutions that supports more than one platform you should use this option.
134-
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
134+
# Other platforms include: linux/s390x,linux/ppc64le
135+
PLATFORMS ?= linux/arm64,linux/amd64
135136
.PHONY: docker-buildx
136-
docker-buildx: test ## Build and push docker image for the manager for cross-platform support
137+
docker-buildx: ## Build and push docker image for the manager for cross-platform support
137138
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
138139
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
139140
- docker buildx create --name project-v3-builder

0 commit comments

Comments
 (0)