Docker Images use golang image for ca-certificates (#608)

backport docker files

close #605
This commit is contained in:
6543 2021-12-13 20:39:13 +01:00 committed by GitHub
parent de5220e8ac
commit aae4da6451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 9 deletions

View file

@ -1,11 +1,18 @@
# docker build --rm -t woodpeckerci/woodpecker-server .
FROM drone/ca-certs
# use golang image to copy ssl certs later
FROM golang:1.16
FROM scratch
# copy certs from golang:1.16 image
COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
EXPOSE 8000 9000 80 443
ENV GODEBUG=netdns=go
ENV DATABASE_DRIVER=sqlite3
ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
ENV GODEBUG=netdns=go
ENV XDG_CACHE_HOME /var/lib/drone
ADD release/drone-server /bin/

View file

@ -1,6 +1,13 @@
# docker build --rm -f Dockerfile.agent -t woodpeckerci/woodpecker-agent .
FROM drone/ca-certs
# use golang image to copy ssl certs later
FROM golang:1.16
FROM scratch
# copy certs from golang:1.16 image
COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
ENV GODEBUG=netdns=go
ADD release/drone-agent /bin/

View file

@ -1,5 +1,4 @@
FROM alpine:3.9.4
FROM alpine:3.14
RUN apk add -U --no-cache ca-certificates
ENV GODEBUG=netdns=go

View file

@ -1,11 +1,11 @@
FROM alpine:3.9.4
EXPOSE 8000 9000 80 443
FROM alpine:3.14
RUN apk add -U --no-cache ca-certificates
EXPOSE 8000 9000 80 443
ENV GODEBUG=netdns=go
ENV DATABASE_DRIVER=sqlite3
ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
ENV GODEBUG=netdns=go
ENV XDG_CACHE_HOME /var/lib/drone
ADD release/drone-server /bin/