Skip to content

Commit 02ca1c8

Browse files
committed
Add dockerfile for building on non-amd64 platforms
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1 parent 4f55001 commit 02ca1c8

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

docker.Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#
66

77
DEV_DOCKER_IMAGE_NAME = docker-cli-dev$(IMAGE_TAG)
8+
BINARY_NATIVE_IMAGE_NAME = docker-cli-native$(IMAGE_TAG)
89
LINTER_IMAGE_NAME = docker-cli-lint$(IMAGE_TAG)
910
CROSS_IMAGE_NAME = docker-cli-cross$(IMAGE_TAG)
1011
VALIDATE_IMAGE_NAME = docker-cli-shell-validate$(IMAGE_TAG)
@@ -30,12 +31,18 @@ build_cross_image:
3031
build_shell_validate_image:
3132
docker build -t $(VALIDATE_IMAGE_NAME) -f ./dockerfiles/Dockerfile.shellcheck .
3233

34+
.PHONY: build_binary_native_image
35+
build_binary_native_image:
36+
docker build -t $(BINARY_NATIVE_IMAGE_NAME) -f ./dockerfiles/Dockerfile.binary-native .
37+
38+
3339
# build executable using a container
34-
binary: build_docker_image
35-
docker run --rm $(ENVVARS) $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make binary
40+
binary: build_binary_native_image
41+
docker run --rm $(ENVVARS) $(MOUNTS) $(BINARY_NATIVE_IMAGE_NAME)
3642

3743
build: binary
3844

45+
3946
# clean build artifacts using a container
4047
.PHONY: clean
4148
clean: build_docker_image
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM golang:1.9.2-alpine3.6
2+
3+
RUN apk add -U git bash coreutils gcc musl-dev
4+
5+
ENV CGO_ENABLED=0 \
6+
DISABLE_WARN_OUTSIDE_CONTAINER=1
7+
WORKDIR /go/src/github.com/docker/cli
8+
CMD ./scripts/build/binary

0 commit comments

Comments
 (0)