Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f311a86

Browse files
acouvreuracouvreur
committedJul 7, 2024·
fix(tests): using acouvreur/whoami:v1.10.2 instead of containous/whoami:v1.5.0
This image simply retrieve the curl binary from curlimages/curl:8.8.0 to be able to add proper docker healthcheck commands. Once this is merged with traefik/whoami, I'll update back to the original image. See traefik/whoami#33
1 parent df61724 commit f311a86

File tree

19 files changed

+27
-29
lines changed

19 files changed

+27
-29
lines changed
 

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
- traefik.http.middlewares.group.plugin.sablier.blocking.timeout=30s
3939

4040
whoami:
41-
image: containous/whoami:v1.5.0
41+
image: acouvreur/whoami:v1.10.2
4242
# Cannot use labels because as soon as the container is stopped, the labels are not treated by Traefik
4343
# The route doesn't exist anymore. Use dynamic-config.yml file instead.
4444
# labels:

‎docs/getting-started.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
- ./Caddyfile:/etc/caddy/Caddyfile:ro
4444

4545
whoami:
46-
image: containous/whoami:v1.5.0
46+
image: acouvreur/whoami:v1.10.2
4747
```
4848
4949
#### **Caddyfile**
@@ -75,7 +75,7 @@ services:
7575
- ./Caddyfile:/etc/caddy/Caddyfile:ro
7676

7777
whoami:
78-
image: containous/whoami:v1.5.0
78+
image: acouvreur/whoami:v1.10.2
7979

8080
sablier:
8181
image: acouvreur/sablier:1.8.0-beta.8
@@ -110,7 +110,7 @@ services:
110110
- ./Caddyfile:/etc/caddy/Caddyfile:ro
111111

112112
whoami:
113-
image: containous/whoami:v1.5.0
113+
image: acouvreur/whoami:v1.10.2
114114

115115
sablier:
116116
image: acouvreur/sablier:1.8.0-beta.8
@@ -139,7 +139,7 @@ services:
139139
- ./Caddyfile:/etc/caddy/Caddyfile:ro
140140
141141
whoami:
142-
image: containous/whoami:v1.5.0
142+
image: acouvreur/whoami:v1.10.2
143143
labels:
144144
- sablier.enable=true
145145
- sablier.group=demo

‎docs/plugins/traefik.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You have to use the dynamic config file provider instead.
2626

2727
```yaml
2828
whoami:
29-
image: containous/whoami:v1.5.0
29+
image: acouvreur/whoami:v1.10.2
3030
labels:
3131
- traefik.enable
3232
- traefik.http.routers.whoami.rule=PathPrefix(`/whoami`)
@@ -66,7 +66,7 @@ See also [`traefik.docker.lbswarm`](https://doc.traefik.io/traefik/routing/provi
6666
```yaml
6767
services:
6868
whoami:
69-
image: containous/whoami:v1.5.0
69+
image: acouvreur/whoami:v1.10.2
7070
deploy:
7171
replicas: 0
7272
labels:

‎docs/providers/docker.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You have to register your containers by opting-in with labels.
5151
```yaml
5252
services:
5353
whoami:
54-
image: containous/whoami:v1.5.0
54+
image: acouvreur/whoami:v1.10.2
5555
labels:
5656
- sablier.enable=true
5757
- sablier.group=mygroup

‎docs/providers/docker_swarm.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You have to register your services by opting-in with labels.
5252
```yaml
5353
services:
5454
whoami:
55-
image: containous/whoami:v1.5.0
55+
image: acouvreur/whoami:v1.10.2
5656
deploy:
5757
labels:
5858
- sablier.enable=true

‎docs/providers/kubernetes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
spec:
8989
containers:
9090
- name: whoami
91-
image: containous/whoami:v1.5.0
91+
image: acouvreur/whoami:v1.10.2
9292
```
9393
9494
## How does Sablier knows when a deployment is ready?

‎plugins/caddy/e2e/docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- '/var/run/docker.sock:/var/run/docker.sock'
2020

2121
whoami:
22-
image: containous/whoami:v1.5.0
22+
image: acouvreur/whoami:v1.10.2
2323
healthcheck:
2424
test: [ "CMD", "curl", "-f", "http://localhost" ]
2525
interval: 5s

‎plugins/caddy/e2e/docker_swarm/docker-stack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
- '/var/run/docker.sock:/var/run/docker.sock'
2525

2626
whoami:
27-
image: containous/whoami:v1.5.0
27+
image: acouvreur/whoami:v1.10.2
2828
healthcheck:
2929
test: [ "CMD", "curl", "-f", "http://localhost" ]
3030
interval: 5s

‎plugins/nginx/e2e/docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
- '/var/run/docker.sock:/var/run/docker.sock'
2424

2525
whoami:
26-
image: containous/whoami:v1.5.0
26+
image: acouvreur/whoami:v1.10.2
2727
healthcheck:
2828
test: [ "CMD", "curl", "-f", "http://localhost" ]
2929
interval: 5s

‎plugins/nginx/e2e/docker_swarm/docker-stack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
- '/var/run/docker.sock:/var/run/docker.sock'
2727

2828
whoami:
29-
image: containous/whoami:v1.5.0
29+
image: acouvreur/whoami:v1.10.2
3030
healthcheck:
3131
test: [ "CMD", "curl", "-f", "http://localhost" ]
3232
interval: 5s

‎plugins/nginx/e2e/kubernetes/manifests/deployment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
spec:
1919
containers:
2020
- name: whoami
21-
image: containous/whoami:v1.5.0
21+
image: acouvreur/whoami:v1.10.2
2222
---
2323
apiVersion: v1
2424
kind: Service

‎plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- '/var/run/docker.sock:/var/run/docker.sock'
2020

2121
whoami:
22-
image: containous/whoami:v1.5.0
22+
image: acouvreur/whoami:v1.10.2
2323
healthcheck:
2424
test: [ "CMD", "curl", "-f", "http://localhost" ]
2525
interval: 5s

‎plugins/proxywasm/e2e/envoy/docker/compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
- '/var/run/docker.sock:/var/run/docker.sock'
1919

2020
whoami:
21-
image: containous/whoami:v1.5.0
21+
image: acouvreur/whoami:v1.10.2
2222
healthcheck:
2323
test: [ "CMD", "curl", "-f", "http://localhost" ]
2424
interval: 5s

‎plugins/proxywasm/e2e/istio/kubernetes/manifests/whoami.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: whoami
19-
image: containous/whoami:v1.5.0
19+
image: acouvreur/whoami:v1.10.2
2020
---
2121
apiVersion: v1
2222
kind: Service

‎plugins/proxywasm/e2e/nginx/docker/compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- '/var/run/docker.sock:/var/run/docker.sock'
2020

2121
whoami:
22-
image: containous/whoami:v1.5.0
22+
image: acouvreur/whoami:v1.10.2
2323
healthcheck:
2424
test: [ "CMD", "curl", "-f", "http://localhost" ]
2525
interval: 5s

‎plugins/traefik/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ services:
9494
- traefik.http.middlewares.dynamic.plugin.sablier.dynamic.sessionDuration=1m
9595

9696
whoami:
97-
image: containous/whoami:v1.5.0
97+
image: acouvreur/whoami:v1.10.2
9898
# Cannot use labels because as soon as the container is stopped, the labels are not treated by Traefik
9999
# The route doesn't exist anymore. Use dynamic-config.yml file instead.
100100
# labels:
@@ -130,7 +130,7 @@ http:
130130
```yaml
131131
services:
132132
whoami:
133-
image: containous/whoami:v1.5.0
133+
image: acouvreur/whoami:v1.10.2
134134
deploy:
135135
replicas: 0
136136
labels:

‎plugins/traefik/e2e/docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
- traefik.http.middlewares.group.plugin.sablier.dynamic.displayName=Group E2E
5555

5656
whoami:
57-
image: containous/whoami:v1.5.0
57+
image: acouvreur/whoami:v1.10.2
5858
# Cannot use labels because as soon as the container is stopped, the labels are not treated by Traefik
5959
# The route doesn't exist anymore. Use dynamic-config.yml file instead.
6060
healthcheck:

‎plugins/traefik/e2e/docker_swarm/docker-stack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
- traefik.http.services.sablier.loadbalancer.server.port=10000
6363

6464
whoami:
65-
image: containous/whoami:v1.5.0
65+
image: acouvreur/whoami:v1.10.2
6666
healthcheck:
6767
test: [ "CMD", "curl", "-f", "http://localhost" ]
6868
interval: 5s

‎plugins/traefik/e2e/kubernetes/manifests/deployment.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ spec:
1818
spec:
1919
containers:
2020
- name: whoami
21-
image: containous/whoami:v1.5.0
21+
image: acouvreur/whoami:v1.10.2
2222
livenessProbe:
23-
exec:
24-
command:
25-
- curl
26-
- -f
27-
- http://localhost
23+
httpGet:
24+
path: /health
25+
port: 80
2826
initialDelaySeconds: 5
2927
periodSeconds: 5
3028
---

0 commit comments

Comments
 (0)
Please sign in to comment.