Skip to content

fix: bring docker-compose and minimal config up-to-date #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nipsufn wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −17
Open

fix: bring docker-compose and minimal config up-to-date #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .docker_compose/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,16 @@ authenticators:
enabled: true
config:
subject: guest
log:
level: trace
format: json

tracing:
provider: jaeger
service_name: ory:oathkeeper
providers:
jaeger:
local_agent_address: jaeger:6831
sampling:
server_url: http://jaeger:5778/sampling
trace_id_ratio: 1
32 changes: 15 additions & 17 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
version: "3.7"

services:
oathkeeper:
build:
context: .
dockerfile: Dockerfile-dc
dockerfile: .docker/Dockerfile-build
ports:
- "4455:4455"
- "4456:4456"
command: serve --config=/etc/config/oathkeeper/config.yaml
environment:
- TRACING_PROVIDER=jaeger
- TRACING_PROVIDER_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
- TRACING_PROVIDER_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
- TRACING_PROVIDER_JAEGER_SAMPLING_TYPE=const
- TRACING_PROVIDER_JAEGER_SAMPLING_VALUE=1
# environment:
# - TRACING_PROVIDER=jaeger
# - TRACING_PROVIDERS_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
# - TRACING_PROVIDERS_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
# - TRACING_PROVIDERS_JAEGER_SAMPLING_TYPE=const
# - TRACING_PROVIDERS_JAEGER_SAMPLING_VALUE=1
volumes:
- type: bind
source: ./.docker_compose
target: /etc/config/oathkeeper
restart: on-failure
jaeger:
image: jaegertracing/all-in-one
image: jaegertracing/jaeger
ports:
- "16686:16686" # The UI port
# These are ports for collecting, sampling, agents, ...
# - "5775:5775/udp"
# - "6831:6831/udp"
# - "6832:6832/udp"
# - "5778:5778"
# - "14268:14268"
# - "9411:9411"
# These are ports for collecting, sampling, agents, ...
- "5775:5775/udp"
- "6831:6831/udp"
- "6832:6832/udp"
- "5778:5778"
- "14268:14268"
- "9411:9411"
Loading