Skip to content

Commit 9ee1833

Browse files
committed
feat: update traefik to v3.2 and add jaeger service with routing configurations
1 parent 6b1f7cb commit 9ee1833

File tree

3 files changed

+53
-21
lines changed

3 files changed

+53
-21
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@
5959
2. Open the NrdSSH client by running `s` in your terminal
6060

6161
## Access services
62-
1. Traefik: [http://localhost:8080](http://localhost:8080)
63-
2. Portainer: [http://localhost:9000](http://localhost:9000)
62+
1. Traefik: [https://traefik.pro.test](https://traefik.pro.test)
63+
2. Portainer: [https://portainer.pro.test](https://portainer.pro.test)
64+
3. Jaeger: [https://jaeger.pro.test](https://jaeger.pro.test)
6465

6566
## How to renew the Programic developer certificate?
6667
1. First build the Docker image to generate the Programic developer certificates. Navigate to `cd services/traefik/certs/docker` and run `bash build.sh`

docker-compose.yml

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,69 @@ services:
88
- 127.0.0.1:8080:8080
99
networks:
1010
- web
11+
- default
1112
volumes:
1213
- /var/run/docker.sock:/var/run/docker.sock
1314
- ./services/traefik/traefik.yaml:/traefik.yaml
1415
- ./services/traefik/dynamic:/dynamic
1516
- ./services/traefik/certs/output:/certs
17+
labels:
18+
- "traefik.enable=true"
19+
- "traefik.http.routers.traefik-server-http.rule=Host(`traefik.pro.test`)"
20+
- "traefik.http.routers.traefik-server-http.entrypoints=web"
21+
- "traefik.http.routers.traefik-server-http.middlewares=secure-headers@file"
22+
- "traefik.http.routers.traefik-server.rule=Host(`traefik.pro.test`)"
23+
- "traefik.http.routers.traefik-server.entrypoints=websecure"
24+
- "traefik.http.routers.traefik-server.middlewares=secure-headers@file"
25+
- "traefik.http.routers.traefik-server.tls=true"
26+
- "traefik.http.services.traefik-server.loadbalancer.server.port=8080"
1627

1728
portainer:
18-
image: portainer/portainer-ce:2.24.1-alpine
29+
image: portainer/portainer-ce:2.29.2-alpine
1930
restart: unless-stopped
2031
ports:
2132
- 127.0.0.1:9000:9000
2233
volumes:
2334
- /var/run/docker.sock:/var/run/docker.sock
2435
- portainer-data:/data
25-
26-
localstack:
27-
image: localstack/localstack:4.0
2836
labels:
2937
- "traefik.enable=true"
30-
- "traefik.http.routers.localstack.rule=Host(`localstack.pro.test`)"
31-
- "traefik.http.services.localstack.loadbalancer.server.port=4566"
32-
- "traefik.http.routers.localstack.entrypoints=websecure"
33-
- "traefik.http.routers.localstack.tls=true"
34-
environment:
35-
- PERSISTENCE=1
38+
- "traefik.http.routers.portainer-server-http.rule=Host(`portainer.pro.test`)"
39+
- "traefik.http.routers.portainer-server-http.entrypoints=web"
40+
- "traefik.http.routers.portainer-server-http.middlewares=secure-headers@file"
41+
- "traefik.http.routers.portainer-server.rule=Host(`portainer.pro.test`)"
42+
- "traefik.http.routers.portainer-server.entrypoints=websecure"
43+
- "traefik.http.routers.portainer-server.middlewares=secure-headers@file"
44+
- "traefik.http.routers.portainer-server.tls=true"
45+
- "traefik.http.services.portainer-server.loadbalancer.server.port=9000"
46+
47+
jaeger:
48+
image: jaegertracing/jaeger:latest
49+
restart: unless-stopped
50+
ports:
51+
- 16686:16686
52+
- 4317:4317
53+
- 4318:4318
54+
- 5778:5778
55+
- 9411:9411
3656
networks:
37-
- localstack
38-
- web
39-
volumes:
40-
- /var/run/docker.sock:/var/run/docker.sock
41-
- localstack-data:/var/lib/localstack
57+
- default
58+
labels:
59+
- "traefik.enable=true"
60+
- "traefik.http.routers.jaeger-server-http.rule=Host(`jaeger.pro.test`)"
61+
- "traefik.http.routers.jaeger-server-http.entrypoints=web"
62+
- "traefik.http.routers.jaeger-server-http.middlewares=secure-headers@file"
63+
- "traefik.http.routers.jaeger-server.rule=Host(`jaeger.pro.test`)"
64+
- "traefik.http.routers.jaeger-server.entrypoints=websecure"
65+
- "traefik.http.routers.jaeger-server.middlewares=secure-headers@file"
66+
- "traefik.http.routers.jaeger-server.tls=true"
67+
- "traefik.http.services.jaeger-server.loadbalancer.server.port=16686"
4268

4369
networks:
70+
default:
71+
external: false
4472
web:
4573
external: true
46-
localstack:
47-
external: true
4874

4975
volumes:
5076
portainer-data:
51-
localstack-data:

services/traefik/traefik.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
log:
2+
level: INFO
13
providers:
24
file:
35
directory: /dynamic
@@ -11,4 +13,8 @@ entryPoints:
1113
websecure:
1214
address: ':443'
1315
api:
14-
insecure: true
16+
insecure: true
17+
tracing:
18+
otlp:
19+
http:
20+
endpoint: http://jaeger:4318/v1/traces

0 commit comments

Comments
 (0)