From a75c1335082e454c7e15e18d23d694322b5aa44e Mon Sep 17 00:00:00 2001 From: schmidtw Date: Thu, 27 Oct 2022 17:05:06 -0700 Subject: [PATCH] Fix the docker container so it has configuration in the right place. --- CHANGELOG.md | 9 +++++++-- Dockerfile | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ded430f..267f44c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [v0.4.10] +- Update dependencies. +- Fix the docker container so it has configuration in the right place. + ## [v0.4.9] - Patch failing docker image, fix linter issues, fix breaking unit tests & changes [#104](https://github.com/xmidt-org/themis/pull/104) @@ -121,8 +125,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Integrated health via InvisionApp/go-health - Converted to a go module: github.com/xmidt-org/themis -[Unreleased]: https://github.com/xmidt-org/themis/compare/v0.4.9...HEAD -[v0.4.8]: https://github.com/xmidt-org/themis/compare/v0.4.8...v0.4.9 +[Unreleased]: https://github.com/xmidt-org/themis/compare/v0.4.10...HEAD +[v0.4.10]: https://github.com/xmidt-org/themis/compare/v0.4.9...v0.4.10 +[v0.4.9]: https://github.com/xmidt-org/themis/compare/v0.4.8...v0.4.9 [v0.4.8]: https://github.com/xmidt-org/themis/compare/v0.4.7...v0.4.8 [v0.4.7]: https://github.com/xmidt-org/themis/compare/v0.4.6...v0.4.7 [v0.4.6]: https://github.com/xmidt-org/themis/compare/v0.4.5...v0.4.6 diff --git a/Dockerfile b/Dockerfile index 6e264f4..960bc23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/themis /src/themis.yaml /src/deploy/packaging/entrypoint.sh /go/bin/spruce /src/Dockerfile /src/NOTICE /src/LICENSE /src/CHANGELOG.md / COPY --from=builder /src/deploy/packaging/themis_spruce.yaml /tmp/themis_spruce.yaml - -RUN mkdir /etc/themis/ && touch /etc/themis/themis.yaml && chmod 666 /etc/themis/themis.yaml +COPY --from=builder /src/themis.yaml /etc/themis/themis.yaml USER nobody