Skip to content

Commit 1c6ccb0

Browse files
committed
indent YAML by 2 spaces, nginx by 4; add container names
1 parent a4f9199 commit 1c6ccb0

File tree

2 files changed

+55
-46
lines changed

2 files changed

+55
-46
lines changed

.editorconfig

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ end_of_line = lf
55
insert_final_newline = true
66
trim_trailing_whitespace = true
77

8-
[*.{conf,yml}]
8+
[*.{yml,yaml}]
9+
indent_style = space
10+
indent_size = 2
11+
insert_final_newline = true
12+
13+
[*.conf]
914
indent_style = space
1015
indent_size = 4
1116
insert_final_newline = true

docker-compose.yml

+49-45
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,52 @@
1-
version: "3"
21
services:
3-
outer-proxy:
4-
build:
5-
context: "."
6-
dockerfile: Dockerfile
7-
extra_hosts:
8-
- "outer-proxy.homelab.dev:10.20.30.2"
9-
- "inner-proxy.homelab.dev:10.20.30.3"
10-
ports:
11-
- "8080:80"
12-
- "8443:443"
13-
volumes:
14-
- ./outer-proxy/conf:/etc/nginx
15-
- ./outer-proxy/logs:/var/log/nginx
16-
networks:
17-
fakelan:
18-
ipv4_address: 10.20.30.2
19-
inner-proxy:
20-
build:
21-
context: "."
22-
dockerfile: Dockerfile
23-
extra_hosts:
24-
- "outer-proxy.homelab.dev:10.20.30.2"
25-
- "inner-proxy.homelab.dev:10.20.30.3"
26-
ports:
27-
- "9090:80"
28-
- "9443:443"
29-
volumes:
30-
- ./inner-proxy/conf:/etc/nginx
31-
- ./inner-proxy/logs:/var/log/nginx
32-
networks:
33-
fakelan:
34-
ipv4_address: 10.20.30.3
35-
backend:
36-
build:
37-
context: "./backend"
38-
ports:
39-
- "4444:4444"
40-
networks:
41-
fakelan:
42-
ipv4_address: 10.20.30.4
2+
outer-proxy:
3+
container_name: "outer-proxy"
4+
build:
5+
context: "."
6+
dockerfile: Dockerfile
7+
extra_hosts:
8+
- "outer-proxy.homelab.dev:10.20.30.2"
9+
- "inner-proxy.homelab.dev:10.20.30.3"
10+
ports:
11+
- "8080:80"
12+
- "8443:443"
13+
volumes:
14+
- ./outer-proxy/conf:/etc/nginx
15+
- ./outer-proxy/logs:/var/log/nginx
16+
networks:
17+
fakelan:
18+
ipv4_address: 10.20.30.2
19+
20+
inner-proxy:
21+
container_name: "inner-proxy"
22+
build:
23+
context: "."
24+
dockerfile: Dockerfile
25+
extra_hosts:
26+
- "outer-proxy.homelab.dev:10.20.30.2"
27+
- "inner-proxy.homelab.dev:10.20.30.3"
28+
ports:
29+
- "9090:80"
30+
- "9443:443"
31+
volumes:
32+
- ./inner-proxy/conf:/etc/nginx
33+
- ./inner-proxy/logs:/var/log/nginx
34+
networks:
35+
fakelan:
36+
ipv4_address: 10.20.30.3
37+
38+
backend:
39+
container_name: "backend"
40+
build:
41+
context: "./backend"
42+
ports:
43+
- "4444:4444"
44+
networks:
45+
fakelan:
46+
ipv4_address: 10.20.30.4
4347

4448
networks:
45-
fakelan:
46-
ipam:
47-
config:
48-
- subnet: "10.20.30.0/24"
49+
fakelan:
50+
ipam:
51+
config:
52+
- subnet: "10.20.30.0/24"

0 commit comments

Comments
 (0)