Skip to content

Commit

Permalink
Merge pull request #690 from davecheney/dockerfile
Browse files Browse the repository at this point in the history
Dockerfile: switch to alpine 3.8
  • Loading branch information
davecheney authored Sep 19, 2018
2 parents 2ffb324 + 135dcb0 commit a14cb50
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.10.3 AS build
FROM golang:1.10.4 AS build
WORKDIR /go/src/github.com/heptio/contour

RUN go get github.com/golang/dep/cmd/dep
Expand All @@ -10,6 +10,6 @@ COPY internal internal
COPY apis apis
RUN CGO_ENABLED=0 GOOS=linux go build -o /go/bin/contour -ldflags="-w -s" -v github.com/heptio/contour/cmd/contour

FROM alpine:3.7 AS final
FROM alpine:3.8 AS final
RUN apk --no-cache add ca-certificates
COPY --from=build /go/bin/contour /bin/contour
14 changes: 0 additions & 14 deletions Dockerfile.race

This file was deleted.

0 comments on commit a14cb50

Please sign in to comment.