Skip to content

Commit ad5f1d1

Browse files
committed
Docker: add support https (without certificate)
1 parent 9b42a9e commit ad5f1d1

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

.docker/compose/base-dev.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
MYSQL_PASSWORD: ${DB_PASS}
99
MYSQL_PORT: ${DB_PORT}
1010
ports:
11-
- 33060:3306 # Reserve port to localhost for database connexion on phpstorm
11+
- "33060:3306" # Reserve port to localhost for database connexion on phpstorm
1212
volumes:
1313
- mysql-db:/var/lib/mysql
1414

@@ -20,12 +20,14 @@ services:
2020
- "--providers.docker=true"
2121
- "--providers.docker.exposedbydefault=false"
2222
- "--entrypoints.web.address=:80"
23+
- "--entrypoints.websecure.address=:443"
2324
ports:
24-
- 80:80
25-
- 443:443
26-
- 8080:8080
25+
- "80:80"
26+
- "443:443"
27+
- "8080:8080"
2728
volumes:
2829
- /var/run/docker.sock:/var/run/docker.sock:ro
30+
restart: unless-stopped
2931
networks:
3032
- sfdemo
3133

.docker/compose/base.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ services:
88
traefik.http.services.www.loadbalancer.server.port: 80
99
traefik.http.routers.www.rule: "Host(`demo.localhost.tv`)"
1010
traefik.http.routers.www.entrypoints: web
11+
traefik.http.routers.www_secure.entrypoints: websecure
12+
traefik.http.routers.www_secure.rule: "Host(`demo.localhost.tv`)"
13+
traefik.http.routers.www_secure.tls: true
1114
ports:
12-
- 80
13-
- 443
15+
- "80"
16+
- "443"
1417
volumes:
1518
- ../../project:/var/www/project/demo
1619
- ../nginx/nginx.conf:/etc/nginx/nginx.conf
@@ -34,7 +37,7 @@ services:
3437
MYSQL_PASSWORD: ${DB_PASS}
3538
TZ: ${TIMEZONE:-Europe/Paris}
3639
ports:
37-
- 3306
40+
- "3306"
3841
networks:
3942
- sfdemo
4043

.docker/compose/docker.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Docker Configuration
2-
COMPOSE_PATH_SEPARATOR=;
2+
COMPOSE_PATH_SEPARATOR=,
33
COMPOSE_PROJECT_NAME=sfdemo
4-
COMPOSE_FILE=.docker/compose/base.yml;.docker/compose/base-dev.yml;.docker/compose/phpmyadmin.yml;.docker/compose/maildev.yml
5-
# [COMPOSE_FILE] You can add ;.docker/compose/custom.yml for customize your local install
4+
COMPOSE_FILE=.docker/compose/base.yml,.docker/compose/base-dev.yml,.docker/compose/phpmyadmin.yml,.docker/compose/maildev.yml
5+
# [COMPOSE_FILE] You can add ,.docker/compose/custom.yml for customize your local install
66

77
# VOLUME_USER_ID=1001 # You can set your Linux UserID (command: id -u)
88
# COMPOSER_HOME=/home/$user/.cache/composer/ # You can set your composer folder, change $user by your username

.docker/compose/maildev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ services:
77
traefik.http.services.maildev.loadbalancer.server.port: 1080
88
traefik.http.routers.maildev.rule: "Host(`maildev.localhost.tv`)"
99
ports:
10-
- 1080
11-
- 1025
10+
- "1080"
11+
- "1025"
1212
networks:
1313
sfdemo:
1414
aliases:

.docker/compose/phpmyadmin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
PMA_USER: ${DB_USER}
1414
PMA_PASSWORD: ${DB_PASS}
1515
ports:
16-
- 80
16+
- "80"
1717
volumes:
1818
- ./../phpmyadmin/config.inc.php:/etc/phpmyadmin/config.user.inc.php
1919
- ./../phpmyadmin/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini

.docker/php/symfony-demo.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ DATABASE_URL=mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:${MYSQL_PORT}
2929
###< doctrine/doctrine-bundle ###
3030

3131
###> symfony/mailer ###
32-
MAILER_DSN=smtp://maildev:25
32+
MAILER_DSN=smtp://maildev:1025
3333
###< symfony/mailer ###

0 commit comments

Comments
 (0)