From af00d3baf239b699192404289ec5eef1db3334b0 Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Tue, 7 Aug 2018 21:58:10 -0700 Subject: [PATCH] Split Dockerfile --- Dockerfile | 5 ++--- Dockerfile.arm32v7 | 16 ++++++++++++++++ Makefile | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 Dockerfile.arm32v7 diff --git a/Dockerfile b/Dockerfile index 0722e06..935497a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -ARG repo_arch -FROM ${repo_arch}golang:1.10 AS builder +FROM golang:1.10 AS builder RUN go get -u github.com/golang/dep/cmd/dep @@ -10,7 +9,7 @@ RUN dep ensure --vendor-only COPY ./main.go /go/src/app/ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o dsched . -FROM ${repo_arch}busybox:latest +FROM busybox:latest WORKDIR /root/ COPY --from=builder /go/src/app/dsched . diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 new file mode 100644 index 0000000..36a8a7f --- /dev/null +++ b/Dockerfile.arm32v7 @@ -0,0 +1,16 @@ +FROM arm32v7/golang:1.10 AS builder + +RUN go get -u github.com/golang/dep/cmd/dep + +WORKDIR /go/src/app/ +COPY ./Gopkg.* /go/src/app/ +RUN dep ensure --vendor-only + +COPY ./main.go /go/src/app/ +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o dsched . + +FROM arm32v7/busybox:latest +WORKDIR /root/ +COPY --from=builder /go/src/app/dsched . + +CMD [ "./dsched" ] diff --git a/Makefile b/Makefile index a74b70d..263608d 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ docker-build: .PHONY: docker-build-arm docker-build-arm: - docker build --build-arg repo_arch=arm32v7/ -t $(DOCKER_TAG)-arm32v7 . + docker build -t $(DOCKER_TAG)-arm32v7 ./Dockerfile.arm32v7 .PHONY: docker-run docker-run: