From 3c97207f3c8301aaf37cf82efc59f53de237e830 Mon Sep 17 00:00:00 2001 From: Trevor Pounds Date: Wed, 25 Sep 2019 10:34:03 -0400 Subject: [PATCH 1/2] Add Alpine Linux images. Fixes #453 Fixes #528 --- .goreleaser.yml | 8 +++++++- Dockerfile.alpine | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.alpine diff --git a/.goreleaser.yml b/.goreleaser.yml index 2f85bfff64cc..2825a09d033c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -55,10 +55,16 @@ changelog: - Merge branch dockers: - - image_templates: + - dockerfile: Dockerfile + image_templates: - "golangci/golangci-lint:latest" - "golangci/golangci-lint:{{ .Tag }}" - "golangci/golangci-lint:v{{ .Major }}.{{ .Minor }}" + - dockerfile: Dockerfile.alpine + image_templates: + - "golangci/golangci-lint:latest-alpine" + - "golangci/golangci-lint:{{ .Tag }}-alpine" + - "golangci/golangci-lint:v{{ .Major }}.{{ .Minor }}-alpine" brews: - github: diff --git a/Dockerfile.alpine b/Dockerfile.alpine new file mode 100644 index 000000000000..7128dd8db8af --- /dev/null +++ b/Dockerfile.alpine @@ -0,0 +1,8 @@ +FROM golang:1.13-alpine + +# required to support cgo +RUN apk --no-cache add gcc musl-dev + +# don't place it into $GOPATH/bin because Drone mounts $GOPATH as volume +COPY golangci-lint /usr/bin/ +CMD ["golangci-lint"] From 6c98b030f00a316e1c363c94a3f9f9ca69b0a6bd Mon Sep 17 00:00:00 2001 From: Trevor Pounds Date: Thu, 26 Sep 2019 10:44:54 -0400 Subject: [PATCH 2/2] Move Dockerfiles to build directory. --- .goreleaser.yml | 4 ++-- Dockerfile => build/Dockerfile | 0 Dockerfile.alpine => build/Dockerfile.alpine | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename Dockerfile => build/Dockerfile (100%) rename Dockerfile.alpine => build/Dockerfile.alpine (100%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 2825a09d033c..2a7b62033801 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -55,12 +55,12 @@ changelog: - Merge branch dockers: - - dockerfile: Dockerfile + - dockerfile: build/Dockerfile image_templates: - "golangci/golangci-lint:latest" - "golangci/golangci-lint:{{ .Tag }}" - "golangci/golangci-lint:v{{ .Major }}.{{ .Minor }}" - - dockerfile: Dockerfile.alpine + - dockerfile: build/Dockerfile.alpine image_templates: - "golangci/golangci-lint:latest-alpine" - "golangci/golangci-lint:{{ .Tag }}-alpine" diff --git a/Dockerfile b/build/Dockerfile similarity index 100% rename from Dockerfile rename to build/Dockerfile diff --git a/Dockerfile.alpine b/build/Dockerfile.alpine similarity index 100% rename from Dockerfile.alpine rename to build/Dockerfile.alpine