From 47be6dfc99bec2654479d13370a71218d5b4e20e Mon Sep 17 00:00:00 2001 From: schmidtw Date: Wed, 26 Oct 2022 22:17:51 -0700 Subject: [PATCH] Fix the Dockerfile so the configuration is not empty. --- CHANGELOG.md | 7 ++++++- Dockerfile | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5322422..5239a94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [v0.1.9] +- Fix the docker image so the configuration file is not empty. +- Updated dependencies. + ## [v0.1.8] - Vuln patches - [CVE-2022-29526](https://github.com/xmidt-org/petasos/issues/106) @@ -47,7 +51,8 @@ Switching to new build process ### Added - Initial creation -[Unreleased]: https://github.com/Comcast/petasos/compare/v0.1.8...HEAD +[Unreleased]: https://github.com/Comcast/petasos/compare/v0.1.9...HEAD +[v0.1.9]: https://github.com/Comcast/petasos/compare/v0.1.8...v0.1.9 [v0.1.8]: https://github.com/Comcast/petasos/compare/v0.1.7...v0.1.8 [v0.1.7]: https://github.com/Comcast/petasos/compare/v0.1.6...v0.1.7 [v0.1.6]: https://github.com/Comcast/petasos/compare/v0.1.5...v0.1.6 diff --git a/Dockerfile b/Dockerfile index f8269e4..3d15029 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ RUN apk add --no-cache --no-progress \ make \ curl \ git \ - openssh \ gcc \ libc-dev \ upx @@ -25,10 +24,9 @@ RUN make test release FROM alpine:3.12.1 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /src/petasos /src/petasos.yaml /src/deploy/packaging/entrypoint.sh /go/bin/spruce /src/Dockerfile /src/NOTICE /src/LICENSE /src/CHANGELOG.md / +COPY --from=builder /src/petasos /src/deploy/packaging/entrypoint.sh /go/bin/spruce /src/Dockerfile /src/NOTICE /src/LICENSE /src/CHANGELOG.md / COPY --from=builder /src/deploy/packaging/petasos_spruce.yaml /tmp/petasos_spruce.yaml - -RUN mkdir /etc/petasos/ && touch /etc/petasos/petasos.yaml && chmod 666 /etc/petasos/petasos.yaml +COPY --from=builder /src/petasos.yaml /etc/petasos/petasos.yaml USER nobody