From 7ac95ea9e8222a6f4f8edd9db941418898770118 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 15 Aug 2017 14:20:15 +0800 Subject: [PATCH 1/2] feat: add multiple stage build for docker. --- .drone.yml | 2 -- Dockerfile | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9ddef31..106763f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,8 +25,6 @@ pipeline: - coverage all - make coverage - make build - # build binary for docker image - - make static_build when: event: [ push, tag, pull_request ] diff --git a/Dockerfile b/Dockerfile index 2971d32..c2cb762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,7 @@ +FROM appleboy/golang-testing AS build-env +ADD . /go/src/github.com/appleboy/drone-ssh +RUN cd /go/src/github.com/appleboy/drone-ssh && make static_build + FROM alpine:3.4 RUN apk update && \ @@ -6,5 +10,5 @@ RUN apk update && \ openssh-client && \ rm -rf /var/cache/apk/* -ADD drone-ssh /bin/ +COPY --from=build-env /go/src/github.com/appleboy/drone-ssh/drone-ssh /bin ENTRYPOINT ["/bin/drone-ssh"] From b6e7ca3356403dccf091ad872da29d0620bef9c1 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 15 Aug 2017 14:22:10 +0800 Subject: [PATCH 2/2] remove unused target Signed-off-by: Bo-Yi Wu --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ce59823..ac3fc90 100644 --- a/Makefile +++ b/Makefile @@ -109,14 +109,12 @@ release-check: cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) # for docker. -static_build: +docker_build: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -a -tags '$(TAGS)' -ldflags '$(EXTLDFLAGS)-s -w $(LDFLAGS)' -o $(DEPLOY_IMAGE) docker_image: docker build -t $(DEPLOY_ACCOUNT)/$(DEPLOY_IMAGE) . -docker: static_build docker_image - docker_deploy: ifeq ($(tag),) @echo "Usage: make $@ tag="