diff --git a/CHANGELOG.md b/CHANGELOG.md index fa6263ee..5a84cd5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [v0.6.11] +- Fix the docker container so it has configuration in the right place. + ## [v0.6.10] - Dependency updates with no vulnerabilities patched. - Fix linting related issues. diff --git a/Dockerfile b/Dockerfile index 10a9b085..99106dd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM docker.io/library/golang:1.19-alpine as builder +FROM docker.io/library/golang:1.15-alpine as builder + +MAINTAINER Jack Murdock WORKDIR /src @@ -6,19 +8,17 @@ ARG VERSION ARG GITCOMMIT ARG BUILDTIME + RUN apk add --no-cache --no-progress \ ca-certificates \ make \ - curl \ git \ openssh \ gcc \ libc-dev \ upx -RUN mkdir -p /go/bin && \ - curl -o /go/bin/spruce https://github.com/geofffranks/spruce/releases/download/v1.29.0/spruce-linux-amd64 && \ - chmod +x /go/bin/spruce +RUN go get github.com/geofffranks/spruce/cmd/spruce && chmod +x /go/bin/spruce COPY . . RUN make test release @@ -27,8 +27,7 @@ FROM alpine:3.12.1 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=builder /src/caduceus /src/caduceus.yaml /src/deploy/packaging/entrypoint.sh /go/bin/spruce /src/Dockerfile /src/NOTICE /src/LICENSE /src/CHANGELOG.md / COPY --from=builder /src/deploy/packaging/caduceus_spruce.yaml /tmp/caduceus_spruce.yaml - -RUN mkdir /etc/caduceus/ && touch /etc/caduceus/caduceus.yaml && chmod 666 /etc/caduceus/caduceus.yaml +COPY --from=builder /src/caduceus.yaml /etc/caduceus/caduceus.yaml USER nobody