-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the docker container so it has configuration in the right place.
- Loading branch information
Showing
2 changed files
with
9 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,24 @@ | ||
FROM docker.io/library/golang:1.19-alpine as builder | ||
FROM docker.io/library/golang:1.15-alpine as builder | ||
|
||
MAINTAINER Jack Murdock <[email protected]> | ||
|
||
WORKDIR /src | ||
|
||
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 | ||
|
||
|