Update certificates for some Docker images

This commit is contained in:
Ludovic Fernandez 2019-04-01 16:48:08 +02:00 committed by Traefiker Bot
parent da20db862d
commit 51a0994d2d
3 changed files with 449 additions and 523 deletions

View file

@ -1,8 +1,9 @@
FROM golang:1.12-alpine FROM golang:1.12-alpine
RUN apk --update upgrade \ RUN apk --update upgrade \
&& apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar \ && apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \
&& rm -rf /var/cache/apk/* && update-ca-certificates \
&& rm -rf /var/cache/apk/*
# Download golangci-lint and misspell binary to bin folder in $GOPATH # Download golangci-lint and misspell binary to bin folder in $GOPATH
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0 \ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0 \

View file

@ -15,8 +15,9 @@ RUN npm run build
FROM golang:1.12-alpine as gobuild FROM golang:1.12-alpine as gobuild
RUN apk --update upgrade \ RUN apk --update upgrade \
&& apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar \ && apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \
&& rm -rf /var/cache/apk/* && update-ca-certificates \
&& rm -rf /var/cache/apk/*
RUN mkdir -p /usr/local/bin \ RUN mkdir -p /usr/local/bin \
&& curl -fsSL -o /usr/local/bin/go-bindata https://github.com/containous/go-bindata/releases/download/v1.0.0/go-bindata \ && curl -fsSL -o /usr/local/bin/go-bindata https://github.com/containous/go-bindata/releases/download/v1.0.0/go-bindata \
@ -33,7 +34,8 @@ RUN ./script/make.sh generate binary
## IMAGE ## IMAGE
FROM scratch FROM scratch
COPY script/ca-certificates.crt /etc/ssl/certs/ COPY --from=gobuild /usr/share/zoneinfo /usr/share/zoneinfo
COPY --from=gobuild /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=gobuild /go/src/github.com/containous/traefik/dist/traefik / COPY --from=gobuild /go/src/github.com/containous/traefik/dist/traefik /
EXPOSE 80 EXPOSE 80

File diff suppressed because it is too large Load diff