diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d81661..f3f752d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + - updated docker image to use go1.12 compiler and build imageproxy as a go module. + ## [0.8.0] (2019-03-21) ### Added diff --git a/Dockerfile b/Dockerfile index 17b1342..b0ac890 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,27 @@ -FROM golang:1.9 as build +FROM golang:1.12 as build MAINTAINER Will Norris RUN useradd -u 1001 go -WORKDIR /go/src/willnorris.com/go/imageproxy -ADD . . +WORKDIR /app -WORKDIR /go/src/willnorris.com/go/imageproxy/cmd/imageproxy -RUN go-wrapper download -RUN CGO_ENABLED=0 GOOS=linux go-wrapper install +COPY go.mod go.sum ./ +RUN go mod download + +COPY . . + +RUN CGO_ENABLED=0 GOOS=linux go build -v ./cmd/imageproxy FROM scratch -WORKDIR /go/bin - COPY --from=build /etc/passwd /etc/passwd COPY --from=build /usr/share/zoneinfo /usr/share/zoneinfo COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=build /go/bin/imageproxy . +COPY --from=build /app/imageproxy /app/imageproxy USER go CMD ["-addr", "0.0.0.0:8080"] -ENTRYPOINT ["/go/bin/imageproxy"] +ENTRYPOINT ["/app/imageproxy"] EXPOSE 8080