diff --git a/.drone.yml b/.drone.yml index c9efb44..dc193bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,7 @@ steps: settings: repo: foo/bar dry_run: true + target: final tags: - ${DRONE_COMMIT_SHA} - ${DRONE_BRANCH} diff --git a/Dockerfile b/Dockerfile index 25ffc94..27fe03c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,15 +7,9 @@ COPY ./ ./ RUN golangci-lint run ## build image: -#ARG GO_VERSION=1.15 -FROM golang:1.15-alpine AS builder +FROM golang:1.15-buster AS builder -RUN mkdir /user && \ - echo 'nobody:x:65534:65534:nobody:/:' > /user/passwd && \ - echo 'nobody:x:65534:' > /user/group -RUN apk add --no-cache ca-certificates git bzip2 make gcc libc-dev - -#RUN GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0 +RUN apt update && apt install -y make bzip2 RUN mkdir -p /build WORKDIR /build @@ -32,7 +26,7 @@ RUN go mod vendor RUN tar -c . | bzip2 > /src.tbz2 ## output image: -FROM ubuntu:focal AS final +FROM debian:buster-slim AS final COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=builder /build/httpd /app/httpd COPY --from=builder /src.tbz2 /usr/local/src/src.tbz2