Skip to content

Commit

Permalink
Merge pull request #388 from xmidt-org/fix_dev_env
Browse files Browse the repository at this point in the history
update docker env to latest bascule config
  • Loading branch information
piccione99 committed Mar 6, 2023
2 parents 365312a + 59d1b7b commit 12450b0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 3 additions & 5 deletions .release/docker/caduceus_spruce.yaml
Expand Up @@ -259,11 +259,9 @@ zap:
# used as authorization.
# (Optional)
jwtValidator:
keys:
factory:
uri: "https://jwt.example.com/keys/{keyId}"
purpose: 0
updateInterval: 604800000000000
Config:
Resolve:
Template: (( grab $THEMIS_ENDPOINT || "http://themis:6500/keys/{keyID}" ))

# authHeader provides the list of basic auth headers that caduceus will accept
# as authorization
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Expand Up @@ -5,7 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [v0.6.13]
- Updated tracing configuration documentation in caduceus.yaml to reflect changes in Candlelight [#372](https://github.com/xmidt-org/caduceus/pull/372)
- Updated bascule config in docker env [#388] (https://github.com/xmidt-org/caduceus/pull/388/files)

## [v0.6.12]
- Remove several unused build files and update the docker images to work. [#360](https://github.com/xmidt-org/caduceus/pull/360)
Expand Down Expand Up @@ -217,7 +220,8 @@ fixed build upload
### Added
- Initial creation

[Unreleased]: https://github.com/xmidt-org/caduceus/compare/v0.6.12...HEAD
[Unreleased]: https://github.com/xmidt-org/caduceus/compare/v0.6.13...HEAD
[v0.6.13]: https://github.com/xmidt-org/caduceus/compare/v0.6.12...v0.6.13
[v0.6.12]: https://github.com/xmidt-org/caduceus/compare/v0.6.11...v0.6.12
[v0.6.11]: https://github.com/xmidt-org/caduceus/compare/v0.6.10...v0.6.11
[v0.6.10]: https://github.com/xmidt-org/caduceus/compare/v0.6.9...v0.6.10
Expand Down

0 comments on commit 12450b0

Please sign in to comment.