Skip to content

Commit

Permalink
Merge pull request #118 from xmidt-org/fix-docker
Browse files Browse the repository at this point in the history
Fix the Dockerfile so the configuration is not empty.
  • Loading branch information
schmidtw authored Oct 27, 2022
2 parents 66231f4 + b4a7ccd commit e78d9d7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN apk add --no-cache --no-progress \
make \
curl \
git \
openssh \
gcc \
libc-dev \
upx
Expand All @@ -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

Expand Down

0 comments on commit e78d9d7

Please sign in to comment.