Build docker-app CLI plugin for arm platform and release it with other platforms.

Signed-off-by: Silvin Lubecki <[email protected]>

Author: silvin-lubecki

Dockerfile

@@ -1,7 +1,7 @@
 FROM dockercore/golang-cross:1.12.9@sha256:3ea9dcef4dd2c46d80445c0b22d6177817f4cfce22c523cc12a5a1091cb37705 AS cli-build
 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
 ARG CLI_CHANNEL=stable
-ARG CLI_VERSION=19.03.4
+ARG CLI_VERSION=19.03.5
 
 RUN apt-get install -y -q --no-install-recommends \
   coreutils \
@@ -13,6 +13,7 @@ WORKDIR /go/src/github.com/docker/cli
 RUN git clone https://github.com/docker/cli . && git checkout v${CLI_VERSION}
 RUN mkdir build
 RUN curl -fL https://download.docker.com/linux/static/${CLI_CHANNEL}/x86_64/docker-${CLI_VERSION}.tgz | tar xzO docker/docker > build/docker-linux-amd64 && chmod +x build/docker-linux-amd64
+RUN curl -fL https://download.docker.com/linux/static/${CLI_CHANNEL}/aarch64/docker-${CLI_VERSION}.tgz | tar xzO docker/docker > build/docker-linux-arm64 && chmod +x build/docker-linux-arm64
 RUN curl -fL https://download.docker.com/mac/static/${CLI_CHANNEL}/x86_64/docker-${CLI_VERSION}.tgz | tar xzO docker/docker > build/docker-darwin-amd64
 
 ARG GOPROXY
@@ -45,7 +46,7 @@ RUN mkdir $GOPATH/src/gotest.tools && \
   ln -s gotestsum-linux /usr/local/bin/gotestsum
 # Source for cmd/test2json is part of the Go distribution and is
 # therefore available in the base image.
-RUN GOOS=linux   go build -o /usr/local/bin/test2json-linux       cmd/test2json && \
+RUN GOOS=linux go build -o /usr/local/bin/test2json-linux       cmd/test2json && \
   GOOS=darwin  go build -o /usr/local/bin/test2json-darwin      cmd/test2json && \
   GOOS=windows go build -o /usr/local/bin/test2json-windows.exe cmd/test2json
 RUN go get -d gopkg.in/mjibson/esc.v0 && \
@@ -66,6 +67,7 @@ RUN make TAG=${TAG} cross
 FROM scratch AS cross
 ARG PROJECT_PATH=/go/src/github.com/docker/app
 COPY --from=cross-build ${PROJECT_PATH}/bin/docker-app-linux docker-app-linux
+COPY --from=cross-build ${PROJECT_PATH}/bin/docker-app-linux-arm64 docker-app-linux-arm64
 COPY --from=cross-build ${PROJECT_PATH}/bin/docker-app-darwin docker-app-darwin
 COPY --from=cross-build ${PROJECT_PATH}/bin/docker-app-windows.exe docker-app-windows.exe
 

Makefile

@@ -37,7 +37,7 @@ check_go_env:
 
 cross: cross-plugin ## cross-compile binaries (linux, darwin, windows)
 
-cross-plugin: bin/$(BIN_NAME)-linux bin/$(BIN_NAME)-darwin bin/$(BIN_NAME)-windows.exe
+cross-plugin: bin/$(BIN_NAME)-linux bin/$(BIN_NAME)-darwin bin/$(BIN_NAME)-windows.exe bin/$(BIN_NAME)-linux-arm64
 
 e2e-cross: bin/$(BIN_NAME)-e2e-linux bin/$(BIN_NAME)-e2e-darwin bin/$(BIN_NAME)-e2e-windows.exe
 
@@ -49,6 +49,10 @@ dynamic: bin/$(BIN_NAME)
 bin/$(BIN_NAME)-e2e-%.exe bin/$(BIN_NAME)-e2e-%: e2e bin/$(BIN_NAME)-%
 	GOOS=$* $(GO_TEST) -c -o $@ ./e2e/
 
+.PHONY: bin/$(BIN_NAME)-linux-arm64
+bin/$(BIN_NAME)-linux-arm64: cmd/$(BIN_NAME) check_go_env
+	GOOS=linux GOARCH=arm64 $(GO_BUILD) -o $@ ./$<
+
 .PHONY: bin/$(BIN_NAME)-windows
 bin/$(BIN_NAME)-%.exe bin/$(BIN_NAME)-%: cmd/$(BIN_NAME) check_go_env
 	GOOS=$* $(GO_BUILD) -o $@ ./$<

docker.Makefile

@@ -39,6 +39,7 @@ shell: build_dev_image ## run a shell in the docker build image
 cross: create_bin ## cross-compile binaries (linux, darwin, windows)
 	docker build $(BUILD_ARGS) --output type=local,dest=./bin/ --target=cross -t $(CROSS_IMAGE_NAME) .
 	@$(call chmod,+x,bin/$(BIN_NAME)-linux)
+	@$(call chmod,+x,bin/$(BIN_NAME)-linux-arm64)
 	@$(call chmod,+x,bin/$(BIN_NAME)-darwin)
 	@$(call chmod,+x,bin/$(BIN_NAME)-windows.exe)
 
@@ -60,6 +61,7 @@ e2e-cross: create_bin
 tars:
 	tar --transform='flags=r;s|$(BIN_NAME)-linux|$(BIN_NAME)-plugin-linux|' -czf bin/$(BIN_NAME)-linux.tar.gz -C bin $(BIN_NAME)-linux
 	tar czf bin/$(BIN_NAME)-e2e-linux.tar.gz -C bin $(BIN_NAME)-e2e-linux
+	tar --transform='flags=r;s|$(BIN_NAME)-linux-arm64|$(BIN_NAME)-plugin-linux-arm64|' -czf bin/$(BIN_NAME)-linux-arm64.tar.gz -C bin $(BIN_NAME)-linux-arm64
 	tar --transform='flags=r;s|$(BIN_NAME)-darwin|$(BIN_NAME)-plugin-darwin|' -czf bin/$(BIN_NAME)-darwin.tar.gz -C bin $(BIN_NAME)-darwin
 	tar czf bin/$(BIN_NAME)-e2e-darwin.tar.gz -C bin $(BIN_NAME)-e2e-darwin
 	tar --transform='flags=r;s|$(BIN_NAME)-windows|$(BIN_NAME)-plugin-windows|' -czf bin/$(BIN_NAME)-windows.tar.gz -C bin $(BIN_NAME)-windows.exe