msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Add multiarch building support for arm64

Browse Source 
Signed-off-by: Bin Lu <bin.lu@arm.com>
pull/5039/head
Bin Lu 6 years ago
parent ed2373629b
commit 9ace71dbc4
5 changed files with 104 additions and 10 deletions
Show Stats Download Patch File Download Diff File

56
Makefile
Unescape View File

@ -6,6 +6,8 @@ SHORT_NAME_RUDDER ?= rudder
TARGETS ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
TARGET_OBJS ?= darwin-amd64.tar.gz darwin-amd64.tar.gz.sha256 linux-amd64.tar.gz linux-amd64.tar.gz.sha256 linux-386.tar.gz linux-386.tar.gz.sha256 linux-arm.tar.gz linux-arm.tar.gz.sha256 linux-arm64.tar.gz linux-arm64.tar.gz.sha256 linux-ppc64le.tar.gz linux-ppc64le.tar.gz.sha256 linux-s390x.tar.gz linux-s390x.tar.gz.sha256 windows-amd64.zip windows-amd64.zip.sha256
DIST_DIRS = find * -type d -exec
ARCH ?= amd64
DOCKER_ARCH_TARGETS ?= amd64 arm arm64 ppc64le s390x
# go option
GO ?= go
@ -21,6 +23,29 @@ BINARIES := helm tiller
# Required for globs to work correctly
SHELL=/usr/bin/env bash
IMAGEARCH ?=
QEMUARCH ?=
ifeq ($(ARCH),amd64)
IMAGEARCH =
QEMUARCH = x86_64
endif
ifeq ($(ARCH),arm)
IMAGEARCH = arm32v7/
QEMUARCH = arm
endif
ifeq ($(ARCH),arm64)
IMAGEARCH = arm64v8/
QEMUARCH = aarch64
endif
ifeq ($(ARCH),ppc64le)
IMAGEARCH = ppc64le/
QEMUARCH = ppc64le
endif
ifeq ($(ARCH),s390x)
IMAGEARCH = s390x/
QEMUARCH = s390x
endif
.PHONY: all
all: build
@ -77,27 +102,44 @@ check-docker:
docker-binary: BINDIR = ./rootfs
docker-binary: GOFLAGS += -a -installsuffix cgo
docker-binary:
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/helm $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller
GOOS=linux GOARCH=$(ARCH) CGO_ENABLED=0 $(GO) build -o $(BINDIR)/helm $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm
GOOS=linux GOARCH=$(ARCH) CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller
.PHONY: docker-pre-cross
docker-pre-cross: check-docker
docker run --rm --privileged multiarch/qemu-user-static:register --reset
.PHONY: docker-build
docker-build: check-docker docker-binary
docker build --rm -t ${IMAGE} rootfs
docker build --rm --build-arg IMAGEARCH=$(IMAGEARCH) --build-arg QEMUARCH=$(QEMUARCH) -t ${IMAGE} rootfs
docker tag ${IMAGE} ${MUTABLE_IMAGE}
# Building multi-arch docker images
.PHONY: docker-build-all
docker-build-all: docker-pre-cross
for arch in $(DOCKER_ARCH_TARGETS); do \
$(MAKE) docker-build ARCH=$$arch; \
done
.PHONY: docker-binary-rudder
docker-binary-rudder: BINDIR = ./rootfs
docker-binary-rudder: GOFLAGS += -a -installsuffix cgo
docker-binary-rudder:
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/rudder $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/rudder
GOOS=linux GOARCH=$(ARCH) CGO_ENABLED=0 $(GO) build -o $(BINDIR)/rudder $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/rudder
.PHONY: docker-build-experimental
docker-build-experimental: check-docker docker-binary docker-binary-rudder
docker build --rm -t ${IMAGE} rootfs -f rootfs/Dockerfile.experimental
docker build --rm --build-arg IMAGEARCH=$(IMAGEARCH) --build-arg QEMUARCH=$(QEMUARCH) -t ${IMAGE} rootfs -f rootfs/Dockerfile.experimental
docker tag ${IMAGE} ${MUTABLE_IMAGE}
docker build --rm -t ${IMAGE_RUDDER} rootfs -f rootfs/Dockerfile.rudder
docker build --rm --build-arg IMAGEARCH=$(IMAGEARCH) --build-arg QEMUARCH=$(QEMUARCH) -t ${IMAGE_RUDDER} rootfs -f rootfs/Dockerfile.rudder
docker tag ${IMAGE_RUDDER} ${MUTABLE_IMAGE_RUDDER}
.PHONY: docker-build-experimental-all
docker-build-experimental-all: docker-pre-cross
for arch in $(DOCKER_ARCH_TARGETS); do \
$(MAKE) docker-build-experimental ARCH=$$arch; \
done
.PHONY: test
test: build
test: TESTFLAGS += -race -v
@ -151,7 +193,7 @@ verify-docs: build
.PHONY: clean
clean:
@rm -rf $(BINDIR) ./rootfs/tiller ./_dist
@rm -rf $(BINDIR) ./rootfs/tiller ./rootfs/helm ./rootfs/rudder ./rootfs/qemu-*-static ./_dist
.PHONY: coverage
coverage:

17
rootfs/Dockerfile
Unescape View File

@ -12,7 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.9
# Get qemu-user-static
FROM alpine:3.9 as qemu
RUN apk add --no-cache curl
ARG QEMUVERSION=2.9.1
ARG QEMUARCH
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
RUN curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMUVERSION}/qemu-${QEMUARCH}-static.tar.gz | tar zxvf - -C /usr/bin
RUN chmod +x /usr/bin/qemu-*
ARG IMAGEARCH
FROM ${IMAGEARCH}alpine:3.9
ARG QEMUARCH
COPY --from=qemu /usr/bin/qemu-${QEMUARCH}-static /usr/bin/
RUN apk add --no-cache ca-certificates socat

17
rootfs/Dockerfile.experimental
Unescape View File

@ -12,7 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.9
# Get qemu-user-static
FROM alpine:3.9 as qemu
RUN apk add --no-cache curl
ARG QEMUVERSION=2.9.1
ARG QEMUARCH
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
RUN curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMUVERSION}/qemu-${QEMUARCH}-static.tar.gz | tar zxvf - -C /usr/bin
RUN chmod +x /usr/bin/qemu-*
ARG IMAGEARCH
FROM ${IMAGEARCH}alpine:3.9
ARG QEMUARCH
COPY --from=qemu /usr/bin/qemu-${QEMUARCH}-static /usr/bin/
RUN apk add --no-cache ca-certificates

17
rootfs/Dockerfile.rudder
Unescape View File

@ -12,7 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.9
# Get qemu-user-static
FROM alpine:3.9 as qemu
RUN apk add --no-cache curl
ARG QEMUVERSION=2.9.1
ARG QEMUARCH
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
RUN curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMUVERSION}/qemu-${QEMUARCH}-static.tar.gz | tar zxvf - -C /usr/bin
RUN chmod +x /usr/bin/qemu-*
ARG IMAGEARCH
FROM ${IMAGEARCH}alpine:3.9
ARG QEMUARCH
COPY --from=qemu /usr/bin/qemu-${QEMUARCH}-static /usr/bin/
RUN apk add --no-cache ca-certificates

7
versioning.mk
Unescape View File

@ -30,6 +30,13 @@ IMAGE_RUDDER := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME_RUDDER}:
MUTABLE_IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
MUTABLE_IMAGE_RUDDER := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME_RUDDER}:${MUTABLE_VERSION}
ifneq ($(ARCH),amd64)
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}-${ARCH}:${DOCKER_VERSION}
IMAGE_RUDDER := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME_RUDDER}-${ARCH}:${DOCKER_VERSION}
MUTABLE_IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}-${ARCH}:${MUTABLE_VERSION}
MUTABLE_IMAGE_RUDDER := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME_RUDDER}-${ARCH}:${MUTABLE_VERSION}
endif
DOCKER_PUSH = docker push
ifeq ($(DOCKER_REGISTRY),gcr.io)
DOCKER_PUSH = gcloud docker push

Write Preview
Loading…
Cancel
Save