From 5e577232e4f8cc4d27871174f2eb4ea19907f7e5 Mon Sep 17 00:00:00 2001 From: Joachim Hill-Grannec Date: Mon, 4 Sep 2017 13:43:03 -0400 Subject: [PATCH 1/4] Update to terraform 0.10.3 Added arm, arm64 and windows dockerfiles Changes to dockerfile should reduce size Update to readme for extra badges (same as drone-plugins) Should just need to uncomment and fix tags to auto-publish to docker hub --- .drone.yml | 105 +++++++++++++++++++++++++++++++++++++++++++-- Dockerfile | 27 +++++++----- Dockerfile.arm | 21 +++++++++ Dockerfile.arm64 | 21 +++++++++ Dockerfile.windows | 13 ++++++ README.md | 6 ++- 6 files changed, 178 insertions(+), 15 deletions(-) create mode 100644 Dockerfile.arm create mode 100644 Dockerfile.arm64 create mode 100644 Dockerfile.windows diff --git a/.drone.yml b/.drone.yml index 49045d3..2b43eb6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,12 +1,109 @@ workspace: base: /go - path: src/github.com/drone-plugins/drone-terraform + path: src/github.com/jmccann/drone-terraform pipeline: test: - image: golang:1.8 + image: golang:1.9 + pull: true + commands: + - go vet + - go test -cover -coverprofile=coverage.out + + build_linux_amd64: + image: golang:1.9 + pull: true + group: build environment: + - GOOS=linux + - GOARCH=amd64 - CGO_ENABLED=0 commands: - - go test -cover -coverprofile=coverage.out - - go build -ldflags "-s -w -X main.revision=$(git rev-parse HEAD)" -a + - go build -v -ldflags "-X main.revision=$(git rev-parse HEAD)" -a -o release/linux/amd64/${DRONE_REPO_NAME} + +# build_linux_arm64: +# image: golang:1.9 +# pull: true +# group: build +# environment: +# - GOOS=linux +# - GOARCH=arm64 +# - CGO_ENABLED=0 +# commands: +# - go build -v -ldflags "-X main.revision=$(git rev-parse HEAD)" -a -o release/linux/arm64/${DRONE_REPO_NAME} + + build_linux_arm: + image: golang:1.9 + pull: true + group: build + environment: + - GOOS=linux + - GOARCH=arm + - CGO_ENABLED=0 + - GOARM=7 + commands: + - go build -v -ldflags "-X main.revision=$(git rev-parse HEAD)" -a -o release/linux/arm/${DRONE_REPO_NAME} + + # build_windows_amd64: + # image: golang:1.9-nanoserver + # pull: true + # group: build + # environment: + # - GOOS=windows + # - GOARCH=amd64 + # - CGO_ENABLED=0 + # commands: + # - go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/windows/amd64/${DRONE_REPO_NAME} + +# publish_linux_amd64: +# image: plugins/docker:17.05 +# pull: true +# repo: jmccann/${DRONE_REPO_NAME} +# tags: [ latest, 1.0.0, 1.0, 1 ] +# secrets: [ docker_username, docker_password ] +# dockerfile: Dockerfile +# when: +# branch: master +# event: push + +# publish_linux_arm64: +# image: plugins/docker:17.05 +# pull: true +# repo: jmccann/${DRONE_REPO_NAME} +# tags: [ linux-arm64 ] +# secrets: [ docker_username, docker_password ] +# dockerfile: Dockerfile.arm64 +# when: +# branch: master +# event: push +# +# publish_linux_arm: +# image: plugins/docker:17.05 +# pull: true +# repo: jmccann/${DRONE_REPO_NAME} +# tags: [ linux-arm ] +# secrets: [ docker_username, docker_password ] +# dockerfile: Dockerfile.arm +# when: +# branch: master +# event: push + + # publish_windows_amd64: + # image: plugins/docker:17.05 + # pull: true + # repo: jmccann/${DRONE_REPO_NAME} + # tags: [ windows-amd64 ] + # secrets: [ docker_username, docker_password ] + # dockerfile: Dockerfile.windows + # when: + # branch: master + # event: push + +# microbadger: +# image: plugins/webhook:1 +# pull: true +# secrets: [ webhook_url ] +# when: +# branch: master +# event: push +# status: [ success ] diff --git a/Dockerfile b/Dockerfile index 2082ebc..a173baa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,26 @@ # Docker image for the Drone Terraform plugin # # docker build --rm=true -t jmccann/drone-terraform:latest . +FROM alpine:3.6 as alpine +RUN apk add -U --no-cache ca-certificates git wget -FROM alpine:3.4 - -RUN apk -U add \ - ca-certificates \ - git \ - wget && \ - rm -rf /var/cache/apk/* - -ENV TERRAFORM_VERSION 0.9.11 +ENV TERRAFORM_VERSION 0.10.3 RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -O terraform.zip && \ unzip terraform.zip -d /bin && \ rm -f terraform.zip -ADD drone-terraform /bin/ +FROM scratch + +ENV GODEBUG=netdns=go +COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=alpine /bin/terraform /bin/terraform + + + +LABEL org.label-schema.version=latest +LABEL org.label-schema.vcs-url="https://github.com/jmccann/drone-terraform.git" +LABEL org.label-schema.name="Drone Terraform" +LABEL org.label-schema.vendor="jmccann" + +ADD release/linux/amd64/drone-terraform /bin/ ENTRYPOINT ["/bin/drone-terraform"] diff --git a/Dockerfile.arm b/Dockerfile.arm new file mode 100644 index 0000000..89323f5 --- /dev/null +++ b/Dockerfile.arm @@ -0,0 +1,21 @@ +FROM alpine:3.6 as alpine +RUN apk add -U --no-cache ca-certificates git wget + +ENV TERRAFORM_VERSION 0.10.3 +RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_arm.zip -O terraform.zip && \ + unzip terraform.zip -d /bin && \ + rm -f terraform.zip + +FROM scratch + +ENV GODEBUG=netdns=go + +COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ + +LABEL org.label-schema.version=latest +LABEL org.label-schema.vcs-url="https://github.com/jmccann/drone-terraform.git" +LABEL org.label-schema.name="Drone Terraform" +LABEL org.label-schema.vendor="jmccann" + +ADD release/linux/arm/drone-terraform /bin/ +ENTRYPOINT ["/bin/drone-terraform"] \ No newline at end of file diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 new file mode 100644 index 0000000..043997a --- /dev/null +++ b/Dockerfile.arm64 @@ -0,0 +1,21 @@ +FROM alpine:3.6 as alpine +RUN apk add -U --no-cache ca-certificates + +ENV TERRAFORM_VERSION 0.10.3 +RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_arm.zip -O terraform.zip && \ + unzip terraform.zip -d /bin && \ + rm -f terraform.zip + +FROM scratch + +ENV GODEBUG=netdns=go + +COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ + +LABEL org.label-schema.version=latest +LABEL org.label-schema.vcs-url="https://github.com/jmccann/drone-terraform.git" +LABEL org.label-schema.name="Drone Terraform" +LABEL org.label-schema.vendor="jmccann" + +ADD release/linux/arm64/drone-terraform /bin/ +ENTRYPOINT ["/bin/drone-terraform"] \ No newline at end of file diff --git a/Dockerfile.windows b/Dockerfile.windows new file mode 100644 index 0000000..03822c2 --- /dev/null +++ b/Dockerfile.windows @@ -0,0 +1,13 @@ +FROM microsoft/nanoserver:latest + +ENV GODEBUG=netdns=go + +ENV TERRAFORM_VERSION 0.10.3 + +LABEL org.label-schema.version=latest +LABEL org.label-schema.vcs-url="https://github.com/jmccann/drone-terraform.git" +LABEL org.label-schema.name="Drone Terraform" +LABEL org.label-schema.vendor="jmccann" + +ADD release/windows/amd64/drone-terraform /bin/ +ENTRYPOINT [ "/bin/drone-terraform" ] \ No newline at end of file diff --git a/README.md b/README.md index 86821a6..148f450 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # drone-terraform [![Build Status](http://beta.drone.io/api/badges/jmccann/drone-terraform/status.svg)](http://beta.drone.io/jmccann/drone-terraform) +[![Join the chat at https://gitter.im/drone/drone](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drone/drone) +[![Go Doc](https://godoc.org/github.com/jmccann/drone-terraform?status.svg)](http://godoc.org/github.com/jmccann/drone-terraform) +[![Go Report](https://goreportcard.com/badge/github.com/jmccann/drone-terraform)](https://goreportcard.com/report/github.com/jmccann/drone-terraform) +[![](https://images.microbadger.com/badges/image/jmccann/drone-terraform.svg)](https://microbadger.com/images/jmccann/drone-terraform "Get your own image badge on microbadger.com") Drone plugin to execute Terraform plan and apply. For the usage information and a listing of the available options please take a look at [the docs](DOCS.md). @@ -19,7 +23,7 @@ go test Build the docker image with the following commands: ``` -CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo +CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo -o release/linux/amd64/drone-terraform docker build --rm=true -t jmccann/drone-terraform . ``` From 5355ee7d66899fabe0041385d853dd9b343f8761 Mon Sep 17 00:00:00 2001 From: Joachim Hill-Grannec Date: Mon, 4 Sep 2017 13:44:53 -0400 Subject: [PATCH 2/4] lgtm no longer used removed MAINTAINERS make no longer used removed Makefile --- MAINTAINERS | 46 ---------------------------------------------- Makefile | 34 ---------------------------------- 2 files changed, 80 deletions(-) delete mode 100644 MAINTAINERS delete mode 100644 Makefile diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 0ecaf19..0000000 --- a/MAINTAINERS +++ /dev/null @@ -1,46 +0,0 @@ -[people] - [people.bradrydzewski] - name = "Brad Rydzewski" - email = "brad@drone.io" - login = "bradrydzewski" - [people.Bugagazavr] - name = "Kirill" - email = "" - login = "Bugagazavr" - [people.donny-dont] - name = "Don Olmstead" - email = "donny-dont@gmail.com" - login = "donny-dont" - [people.jackspirou] - name = "Jack Spirou" - email = "" - login = "jackspirou" - [people.msteinert] - name = "Mike Steinert" - email = "" - login = "msteinert" - [people.nlf] - name = "Nathan LaFreniere" - email = "" - login = "nlf" - [people.tboerger] - name = "Thomas Boerger" - email = "thomas@webhippie.de" - login = "tboerger" - [people.athieriot] - name = "Aurélien Thieriot" - email = "a.thieriot@gmail.com" - login = "athieriot" - -[org] - [org.core] - people = [ - "bradrydzewski", - "Bugagazavr", - "donny-dont", - "jackspirou", - "msteinert", - "nlf", - "tboerger", - "athieriot" - ] diff --git a/Makefile b/Makefile deleted file mode 100644 index 0dc93e2..0000000 --- a/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -.PHONY: all clean deps fmt vet test docker - -EXECUTABLE ?= drone-terraform -IMAGE ?= plugins/$(EXECUTABLE) -COMMIT ?= $(shell git rev-parse --short HEAD) - -LDFLAGS = -X "main.buildCommit=$(COMMIT)" -PACKAGES = $(shell go list ./... | grep -v /vendor/) - -all: deps build test - -clean: - go clean -i ./... - -deps: - go get -t ./... - -fmt: - go fmt $(PACKAGES) - -vet: - go vet $(PACKAGES) - -test: - @for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; - -docker: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-s -w $(LDFLAGS)' - docker build --rm -t $(IMAGE) . - -$(EXECUTABLE): $(wildcard *.go) - go build -ldflags '-s -w $(LDFLAGS)' - -build: $(EXECUTABLE) From 2c7aa7f0c6740c805f806879b915b50947a68304 Mon Sep 17 00:00:00 2001 From: Joachim Hill-Grannec Date: Mon, 4 Sep 2017 14:20:43 -0400 Subject: [PATCH 3/4] Update to work until from scratch gets working with deps --- Dockerfile | 7 ++++--- Dockerfile.arm | 6 ++++-- Dockerfile.arm64 | 8 +++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a173baa..05388ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,11 +9,12 @@ RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf unzip terraform.zip -d /bin && \ rm -f terraform.zip -FROM scratch +#TODO: need to add rm to scratch +#FROM scratch ENV GODEBUG=netdns=go -COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=alpine /bin/terraform /bin/terraform +#COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +#COPY --from=alpine /bin/terraform /bin/terraform diff --git a/Dockerfile.arm b/Dockerfile.arm index 89323f5..3219b48 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -6,11 +6,13 @@ RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf unzip terraform.zip -d /bin && \ rm -f terraform.zip -FROM scratch +#TODO: need to add rm to scratch +#FROM scratch ENV GODEBUG=netdns=go -COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +#COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +#COPY --from=alpine /bin/terraform /bin/terraform LABEL org.label-schema.version=latest LABEL org.label-schema.vcs-url="https://github.com/jmccann/drone-terraform.git" diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 043997a..83a44e2 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,16 +1,18 @@ FROM alpine:3.6 as alpine -RUN apk add -U --no-cache ca-certificates +RUN apk add -U --no-cache ca-certificates git wget ENV TERRAFORM_VERSION 0.10.3 RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_arm.zip -O terraform.zip && \ unzip terraform.zip -d /bin && \ rm -f terraform.zip -FROM scratch +#TODO: need to add rm to scratch +#FROM scratch ENV GODEBUG=netdns=go -COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +#COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +#COPY --from=alpine /bin/terraform /bin/terraform LABEL org.label-schema.version=latest LABEL org.label-schema.vcs-url="https://github.com/jmccann/drone-terraform.git" From 0c1cc69191f43031ada610b5dc1283fd18db2985 Mon Sep 17 00:00:00 2001 From: Joachim Hill-Grannec Date: Mon, 4 Sep 2017 16:59:12 -0400 Subject: [PATCH 4/4] easier to have same drone file used while contributing --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2b43eb6..79c24ba 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ workspace: base: /go - path: src/github.com/jmccann/drone-terraform + path: src/github.com/${DRONE_REPO} pipeline: test: @@ -58,7 +58,7 @@ pipeline: # publish_linux_amd64: # image: plugins/docker:17.05 # pull: true -# repo: jmccann/${DRONE_REPO_NAME} +# repo: ${DRONE_REPO} # tags: [ latest, 1.0.0, 1.0, 1 ] # secrets: [ docker_username, docker_password ] # dockerfile: Dockerfile @@ -69,7 +69,7 @@ pipeline: # publish_linux_arm64: # image: plugins/docker:17.05 # pull: true -# repo: jmccann/${DRONE_REPO_NAME} +# repo: ${DRONE_REPO} # tags: [ linux-arm64 ] # secrets: [ docker_username, docker_password ] # dockerfile: Dockerfile.arm64 @@ -80,7 +80,7 @@ pipeline: # publish_linux_arm: # image: plugins/docker:17.05 # pull: true -# repo: jmccann/${DRONE_REPO_NAME} +# repo: ${DRONE_REPO} # tags: [ linux-arm ] # secrets: [ docker_username, docker_password ] # dockerfile: Dockerfile.arm @@ -91,7 +91,7 @@ pipeline: # publish_windows_amd64: # image: plugins/docker:17.05 # pull: true - # repo: jmccann/${DRONE_REPO_NAME} + # repo: ${DRONE_REPO} # tags: [ windows-amd64 ] # secrets: [ docker_username, docker_password ] # dockerfile: Dockerfile.windows