Skip to content

Commit 69cf7a0

Browse files
lucaslorentzlucaslorentz
committed
Switch to containous/whoami image to support arm64
1 parent fce8746 commit 69cf7a0

File tree

10 files changed

+61
-61
lines changed

10 files changed

+61
-61
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ $ docker-compose up -d
9090
version: '3.7'
9191
services:
9292
whoami:
93-
image: jwilder/whoami
93+
image: containous/whoami
9494
networks:
9595
- caddy
9696
labels:
9797
caddy: whoami.example.com
98-
caddy.reverse_proxy: "{{upstreams 8000}}"
98+
caddy.reverse_proxy: "{{upstreams 80}}"
9999

100100
networks:
101101
caddy:
@@ -636,9 +636,9 @@ $ docker stack rm caddy-docker-demo
636636
```
637637
$ docker run --name caddy -d -p 443:443 -v /var/run/docker.sock:/var/run/docker.sock lucaslorentz/caddy-docker-proxy:ci-alpine
638638
639-
$ docker run --name whoami0 -d -l caddy=whoami0.example.com -l "caddy.reverse_proxy={{upstreams 8000}}" -l caddy.tls=internal jwilder/whoami
639+
$ docker run --name whoami0 -d -l caddy=whoami0.example.com -l "caddy.reverse_proxy={{upstreams 80}}" -l caddy.tls=internal containous/whoami
640640
641-
$ docker run --name whoami1 -d -l caddy=whoami1.example.com -l "caddy.reverse_proxy={{upstreams 8000}}" -l caddy.tls=internal jwilder/whoami
641+
$ docker run --name whoami1 -d -l caddy=whoami1.example.com -l "caddy.reverse_proxy={{upstreams 80}}" -l caddy.tls=internal containous/whoami
642642
643643
$ curl -k --resolve whoami0.example.com:443:127.0.0.1 https://whoami0.example.com
644644
$ curl -k --resolve whoami1.example.com:443:127.0.0.1 https://whoami1.example.com

‎examples/distributed.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,51 +35,51 @@ services:
3535

3636
# Proxy to service
3737
whoami0:
38-
image: jwilder/whoami
38+
image: containous/whoami
3939
networks:
4040
- caddy
4141
deploy:
4242
labels:
4343
caddy: whoami0.example.com
44-
caddy.reverse_proxy: "{{upstreams 8000}}"
44+
caddy.reverse_proxy: "{{upstreams 80}}"
4545
# remove the following line when you have verified your setup
4646
# Otherwise you risk being rate limited by let's encrypt
4747
caddy.tls.ca: https://acme-staging-v02.api.letsencrypt.org/directory
4848

4949
# Proxy to service
5050
whoami1:
51-
image: jwilder/whoami
51+
image: containous/whoami
5252
networks:
5353
- caddy
5454
deploy:
5555
labels:
5656
caddy: whoami1.example.com
57-
caddy.reverse_proxy: "{{upstreams 8000}}"
57+
caddy.reverse_proxy: "{{upstreams 80}}"
5858
caddy.tls: "internal"
5959

6060
# Proxy to container
6161
whoami2:
62-
image: jwilder/whoami
62+
image: containous/whoami
6363
networks:
6464
- caddy
6565
labels:
6666
caddy: whoami2.example.com
67-
caddy.reverse_proxy: "{{upstreams 8000}}"
67+
caddy.reverse_proxy: "{{upstreams 80}}"
6868
caddy.tls: "internal"
6969

7070
# Proxy to container
7171
whoami3:
72-
image: jwilder/whoami
72+
image: containous/whoami
7373
networks:
7474
- caddy
7575
labels:
7676
caddy: whoami3.example.com
77-
caddy.reverse_proxy: "{{upstreams 8000}}"
77+
caddy.reverse_proxy: "{{upstreams 80}}"
7878
caddy.tls: "internal"
7979

8080
# Proxy with matches and route
8181
echo_0:
82-
image: brndnmtthws/nginx-echo-headers
82+
image: containous/whoami
8383
networks:
8484
- caddy
8585
deploy:
@@ -89,7 +89,7 @@ services:
8989
caddy.route: "@match"
9090
caddy.route.0_uri: "strip_prefix /sourcepath"
9191
caddy.route.1_rewrite: "* /targetpath{path}"
92-
caddy.route.2_reverse_proxy: "{{upstreams 8080}}"
92+
caddy.route.2_reverse_proxy: "{{upstreams 80}}"
9393
caddy.tls: "internal"
9494

9595
networks:

‎examples/standalone.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,51 +38,51 @@ services:
3838

3939
# Proxy to service
4040
whoami0:
41-
image: jwilder/whoami
41+
image: containous/whoami
4242
networks:
4343
- caddy
4444
deploy:
4545
labels:
4646
caddy: whoami0.example.com
47-
caddy.reverse_proxy: "{{upstreams 8000}}"
47+
caddy.reverse_proxy: "{{upstreams 80}}"
4848
caddy.tls: "internal"
4949

5050
# Proxy to service that you want to expose to the outside world
5151
whoami1:
52-
image: jwilder/whoami
52+
image: containous/whoami
5353
networks:
5454
- caddy
5555
deploy:
5656
labels:
5757
caddy: whoami1.example.com
58-
caddy.reverse_proxy: "{{upstreams 8000}}"
58+
caddy.reverse_proxy: "{{upstreams 80}}"
5959
# remove the following line when you have verified your setup
6060
# Otherwise you risk being rate limited by let's encrypt
6161
caddy.tls.ca: https://acme-staging-v02.api.letsencrypt.org/directory
6262

6363
# Proxy to container
6464
whoami2:
65-
image: jwilder/whoami
65+
image: containous/whoami
6666
networks:
6767
- caddy
6868
labels:
6969
caddy: whoami2.example.com
70-
caddy.reverse_proxy: "{{upstreams 8000}}"
70+
caddy.reverse_proxy: "{{upstreams 80}}"
7171
caddy.tls: "internal"
7272

7373
# Proxy to container
7474
whoami3:
75-
image: jwilder/whoami
75+
image: containous/whoami
7676
networks:
7777
- caddy
7878
labels:
7979
caddy: whoami3.example.com
80-
caddy.reverse_proxy: "{{upstreams 8000}}"
80+
caddy.reverse_proxy: "{{upstreams 80}}"
8181
caddy.tls: "internal"
8282

8383
# Proxy with matches and route
8484
echo_0:
85-
image: brndnmtthws/nginx-echo-headers
85+
image: containous/whoami
8686
networks:
8787
- caddy
8888
deploy:
@@ -92,7 +92,7 @@ services:
9292
caddy.route: "@match"
9393
caddy.route.0_uri: "strip_prefix /sourcepath"
9494
caddy.route.1_rewrite: "* /targetpath{path}"
95-
caddy.route.2_reverse_proxy: "{{upstreams 8080}}"
95+
caddy.route.2_reverse_proxy: "{{upstreams 80}}"
9696
caddy.tls: "internal"
9797

9898
networks:

‎tests/caddyfile+config/compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
caddy.email: "[email protected]"
2929

3030
service:
31-
image: jwilder/whoami
31+
image: containous/whoami
3232
networks:
3333
- caddy
3434
deploy:

‎tests/distributed/compose.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,49 +33,49 @@ services:
3333

3434
# Proxy to service
3535
whoami0:
36-
image: jwilder/whoami
36+
image: containous/whoami
3737
networks:
3838
- caddy
3939
deploy:
4040
labels:
4141
caddy: whoami0.example.com
42-
caddy.reverse_proxy: "{{upstreams 8000}}"
42+
caddy.reverse_proxy: "{{upstreams 80}}"
4343
caddy.tls: "internal"
4444

4545
# Proxy to service
4646
whoami1:
47-
image: jwilder/whoami
47+
image: containous/whoami
4848
networks:
4949
- caddy
5050
deploy:
5151
labels:
5252
caddy: whoami1.example.com
53-
caddy.reverse_proxy: "{{upstreams 8000}}"
53+
caddy.reverse_proxy: "{{upstreams 80}}"
5454
caddy.tls: "internal"
5555

5656
# Proxy to container
5757
whoami2:
58-
image: jwilder/whoami
58+
image: containous/whoami
5959
networks:
6060
- caddy
6161
labels:
6262
caddy: whoami2.example.com
63-
caddy.reverse_proxy: "{{upstreams 8000}}"
63+
caddy.reverse_proxy: "{{upstreams 80}}"
6464
caddy.tls: "internal"
6565

6666
# Proxy to container
6767
whoami3:
68-
image: jwilder/whoami
68+
image: containous/whoami
6969
networks:
7070
- caddy
7171
labels:
7272
caddy: whoami3.example.com
73-
caddy.reverse_proxy: "{{upstreams 8000}}"
73+
caddy.reverse_proxy: "{{upstreams 80}}"
7474
caddy.tls: "internal"
7575

7676
# Proxy with matches and route
7777
echo_0:
78-
image: brndnmtthws/nginx-echo-headers
78+
image: containous/whoami
7979
networks:
8080
- caddy
8181
deploy:
@@ -85,7 +85,7 @@ services:
8585
caddy.route: "@match"
8686
caddy.route.0_uri: "strip_prefix /sourcepath"
8787
caddy.route.1_rewrite: "* /targetpath{path}"
88-
caddy.route.2_reverse_proxy: "{{upstreams 8080}}"
88+
caddy.route.2_reverse_proxy: "{{upstreams 80}}"
8989
caddy.tls: "internal"
9090

9191
networks:

‎tests/ingress-networks/compose.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ services:
3434

3535
# Proxy to service
3636
whoami0:
37-
image: jwilder/whoami
37+
image: containous/whoami
3838
networks:
3939
- ingress_0
4040
deploy:
4141
labels:
4242
caddy: whoami0.example.com
43-
caddy.reverse_proxy: "{{upstreams 8000}}"
43+
caddy.reverse_proxy: "{{upstreams 80}}"
4444
caddy.tls: "internal"
4545

4646
# Proxy to service
4747
whoami1:
48-
image: jwilder/whoami
48+
image: containous/whoami
4949
networks:
5050
- ingress_1
5151
deploy:
5252
labels:
5353
caddy: whoami1.example.com
54-
caddy.reverse_proxy: "{{upstreams 8000}}"
54+
caddy.reverse_proxy: "{{upstreams 80}}"
5555
caddy.tls: "internal"
5656

5757
networks:

‎tests/process-caddyfile-off/compose_correct.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ services:
1818

1919
# Proxy to service
2020
whoami0:
21-
image: jwilder/whoami
21+
image: containous/whoami
2222
networks:
2323
- caddy
2424
deploy:
2525
labels:
2626
caddy: whoami0.example.com
27-
caddy.reverse_proxy: "{{upstreams 8000}}"
27+
caddy.reverse_proxy: "{{upstreams 80}}"
2828
caddy.tls: "internal"
2929

3030
# Proxy to service
3131
whoami1:
32-
image: jwilder/whoami
32+
image: containous/whoami
3333
networks:
3434
- caddy
3535
deploy:
3636
labels:
3737
caddy: whoami1.example.com
38-
caddy.reverse_proxy: "{{upstreams 8000}}"
38+
caddy.reverse_proxy: "{{upstreams 80}}"
3939
caddy.tls: "internal"
4040

4141
networks:

‎tests/process-caddyfile-off/compose_wrong.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ services:
1818

1919
# Proxy to service
2020
whoami0:
21-
image: jwilder/whoami
21+
image: containous/whoami
2222
networks:
2323
- caddy
2424
deploy:
2525
labels:
2626
caddy: whoami0.example.com
27-
caddy.reverse_proxy: "{{upstreams 8000}}"
27+
caddy.reverse_proxy: "{{upstreams 80}}"
2828
caddy.tls: "invalid_value"
2929

3030
# Proxy to service
3131
whoami1:
32-
image: jwilder/whoami
32+
image: containous/whoami
3333
networks:
3434
- caddy
3535
deploy:
3636
labels:
3737
caddy: whoami1.example.com
38-
caddy.reverse_proxy: "{{upstreams 8000}}"
38+
caddy.reverse_proxy: "{{upstreams 80}}"
3939
caddy.tls: "internal"
4040

4141
networks:

‎tests/process-caddyfile-on/compose_wrong.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ services:
1818

1919
# Proxy to service
2020
whoami0:
21-
image: jwilder/whoami
21+
image: containous/whoami
2222
networks:
2323
- caddy
2424
deploy:
2525
labels:
2626
caddy: whoami0.example.com
27-
caddy.reverse_proxy: "{{upstreams 8000}}"
27+
caddy.reverse_proxy: "{{upstreams 80}}"
2828
caddy.tls: "invalid_value"
2929

3030
# Proxy to service
3131
whoami1:
32-
image: jwilder/whoami
32+
image: containous/whoami
3333
networks:
3434
- caddy
3535
deploy:
3636
labels:
3737
caddy: whoami1.example.com
38-
caddy.reverse_proxy: "{{upstreams 8000}}"
38+
caddy.reverse_proxy: "{{upstreams 80}}"
3939
caddy.tls: "internal"
4040

4141
networks:

0 commit comments

Comments
 (0)