Skip to content

Commit e23c3f6

Browse files
committed
fixing indentation
1 parent 3b955f6 commit e23c3f6

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

docker-compose.yml

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ services:
66
proxy:
77
image: jwilder/nginx-proxy
88
ports:
9-
- 80:80
10-
- 443:443
9+
- 80:80
10+
- 443:443
1111
volumes:
12-
- ./configs/proxy/conf.d:/etc/nginx/conf.d
13-
- ./configs/proxy/vhost.d:/etc/nginx/vhost.d
14-
- ./configs/proxy/html:/usr/share/nginx/html
15-
- ./configs/proxy/certs:/etc/nginx/certs:ro
16-
- /var/run/docker.sock:/tmp/docker.sock:ro
12+
- ./configs/proxy/conf.d:/etc/nginx/conf.d
13+
- ./configs/proxy/vhost.d:/etc/nginx/vhost.d
14+
- ./configs/proxy/html:/usr/share/nginx/html
15+
- ./configs/proxy/certs:/etc/nginx/certs:ro
16+
- /var/run/docker.sock:/tmp/docker.sock:ro
1717
networks:
18-
- proxy-tier
18+
- proxy-tier
1919
restart: always
2020

2121
# Letsencrypt
2222
letsencrypt-companion:
2323
image: jrcs/letsencrypt-nginx-proxy-companion
2424
volumes_from:
25-
- proxy
25+
- proxy
2626
volumes:
27-
- /var/run/docker.sock:/var/run/docker.sock:ro
28-
- ./configs/proxy/certs:/etc/nginx/certs:rw
27+
- /var/run/docker.sock:/var/run/docker.sock:ro
28+
- ./configs/proxy/certs:/etc/nginx/certs:rw
2929
restart: always
3030
# <<<<< Https
3131

@@ -42,14 +42,14 @@ services:
4242
# The command would be
4343
# export DOMAIN=your-domain.com && export EMAIL = email@your-domain.com && docker-compose up
4444
environment:
45-
- VIRTUAL_HOST=${DOMAIN}
46-
- VIRTUAL_NETWORK=nginx-proxy
47-
- VIRTUAL_PORT=80
48-
- LETSENCRYPT_HOST=${DOMAIN}
49-
- LETSENCRYPT_EMAIL=${EMAIL}
45+
- VIRTUAL_HOST=${DOMAIN}
46+
- VIRTUAL_NETWORK=nginx-proxy
47+
- VIRTUAL_PORT=80
48+
- LETSENCRYPT_HOST=${DOMAIN}
49+
- LETSENCRYPT_EMAIL=${EMAIL}
5050
networks:
51-
- proxy-tier
52-
- default
51+
- proxy-tier
52+
- default
5353

5454
wp_server:
5555
build:
@@ -59,12 +59,10 @@ services:
5959
# PHP_VERSION: 7.0
6060
# PHP_VERSION: 5.6
6161
volumes:
62-
- ./www/wp_files/:/www
63-
- ./configs/php/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
62+
- ./www/wp_files/:/www
63+
- ./configs/php/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
6464
links:
6565
- wp_mariadb
66-
# networks:
67-
# - proxy-tier
6866

6967
wp_mariadb:
7068
image: mariadb
@@ -78,8 +76,6 @@ services:
7876
# export DB_PASS=YOUR_SUPER_SECURE_PASSWORD && docker-compose up
7977
environment:
8078
- MYSQL_ROOT_PASSWORD=${DB_PASS}
81-
# networks:
82-
# - proxy-tier
8379

8480
wp_phpmyadmin:
8581
image: phpmyadmin/phpmyadmin
@@ -90,8 +86,6 @@ services:
9086
- wp_mariadb
9187
ports:
9288
- "8888:80"
93-
# networks:
94-
# - proxy-tier
9589

9690
networks:
9791
proxy-tier:

0 commit comments

Comments
 (0)