Skip to content

Commit

Permalink
Fix the docker container so it has configuration in the right place.
Browse files Browse the repository at this point in the history
  • Loading branch information
schmidtw committed Oct 27, 2022
1 parent 04c5c98 commit 4b1c0c2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
13 changes: 6 additions & 7 deletions Dockerfile
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

Expand All @@ -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

Expand Down

0 comments on commit 4b1c0c2

Please sign in to comment.