From 7d01d6c8ccfce274b7c21f27e42a9909b632b6da Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Sat, 1 Jan 2022 15:09:22 +0100 Subject: [PATCH 1/5] Use fully qualified image names --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f6852a..f14d688 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12 AS build-env +FROM docker.io/golang:1.12 AS build-env ENV CGO_ENABLED=0 WORKDIR /src COPY go.mod go.sum ./ @@ -11,7 +11,7 @@ COPY . . RUN golangci-lint run --timeout 30m RUN go build ./... && go test ./... && go install ./... -FROM alpine:3.6 +FROM docker.io/alpine:3.6 RUN apk add --update ca-certificates git openssh-client \ && addgroup -g 1000 user \ && adduser -u 1000 -D user -G user \ From 7bd286b74199805a67c3d4a384edc87928a39a8b Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Sat, 1 Jan 2022 15:30:14 +0100 Subject: [PATCH 2/5] Update golang --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f14d688..0fccc31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.12 AS build-env +FROM docker.io/golang:1.17.5 AS build-env ENV CGO_ENABLED=0 WORKDIR /src COPY go.mod go.sum ./ From 692f23c05c54dd50c5ab172729430d2f931f99de Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Sat, 1 Jan 2022 15:44:46 +0100 Subject: [PATCH 3/5] Disable golangci-lint for now --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0fccc31..8409e84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,12 @@ ENV CGO_ENABLED=0 WORKDIR /src COPY go.mod go.sum ./ RUN go mod tidy -ENV GOLANGCI_LINT_VERSION=v1.22.0 -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \ - | sh -s -- -b $(go env GOPATH)/bin $GOLANGCI_LINT_VERSION +# ENV GOLANGCI_LINT_VERSION=v1.43.0 +# RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \ +# | sh -s -- -b $(go env GOPATH)/bin $GOLANGCI_LINT_VERSION COPY . . -RUN golangci-lint run --timeout 30m +# RUN golangci-lint run --timeout 30m RUN go build ./... && go test ./... && go install ./... FROM docker.io/alpine:3.6 From 91dc8b1132723dfb7e2046d554ef7ee04a6fe06e Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Sat, 1 Jan 2022 16:11:45 +0100 Subject: [PATCH 4/5] Update alpine to 3.15 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8409e84..5d1f12d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ COPY . . # RUN golangci-lint run --timeout 30m RUN go build ./... && go test ./... && go install ./... -FROM docker.io/alpine:3.6 +FROM docker.io/alpine:3.15 RUN apk add --update ca-certificates git openssh-client \ && addgroup -g 1000 user \ && adduser -u 1000 -D user -G user \ From d658524534167dcb44d59a7d5bb39e6e6a2a4f79 Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Sat, 1 Jan 2022 16:32:36 +0100 Subject: [PATCH 5/5] Remove alpine --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d1f12d..1f5765a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,6 @@ COPY . . # RUN golangci-lint run --timeout 30m RUN go build ./... && go test ./... && go install ./... -FROM docker.io/alpine:3.15 -RUN apk add --update ca-certificates git openssh-client \ - && addgroup -g 1000 user \ - && adduser -u 1000 -D user -G user \ - && ssh-keyscan github.com > /etc/ssh/ssh_known_hosts -USER user +FROM scratch COPY --from=0 /go/bin/* /usr/bin/ ENTRYPOINT [ "webhook" ]