Skip to content

Commit 012b61f

Browse files
guliengulien
authored
Merge pull request #41 from DrEdwardPCB/fix-docker-compose
fix-docker-compose
2 parents 5be53c9 + b9437d1 commit 012b61f

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

‎docker-compose.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- --api.insecure=true
1313
labels:
1414
- traefik.enable=true
15-
- traefik.http.routers.traefik_dashboard_router.rule=Host(`traefik.$DOMAIN`)
15+
- traefik.http.routers.traefik_dashboard_router.rule=Host(`traefik.${DOMAIN}`)
1616
- traefik.http.routers.traefik_dashboard_router.service=traefik_dashboard_service
1717
- traefik.http.services.traefik_dashboard_service.loadbalancer.server.port=8080
1818
ports:
@@ -24,7 +24,7 @@ services:
2424
image: thecodingmachine/nodejs:14
2525
labels:
2626
- traefik.enable=true
27-
- traefik.http.routers.webapp_router.rule=Host(`$DOMAIN`)
27+
- traefik.http.routers.webapp_router.rule=Host(`${DOMAIN}`)
2828
- traefik.http.routers.webapp_router.service=webapp_service
2929
- traefik.http.services.webapp_service.loadbalancer.server.port=3000
3030
expose:
@@ -45,17 +45,17 @@ services:
4545
HOST: "0.0.0.0"
4646
# Nuxt.js
4747
# ---------------------
48-
APP_NAME: "$APP_NAME"
48+
APP_NAME: "${APP_NAME}"
4949
# API.
50-
API_URL: "http://$API_SUBDOMAIN.$DOMAIN/"
50+
API_URL: "http://${API_SUBDOMAIN}.${DOMAIN}/"
5151
# GraphQL.
52-
GRAPHQL_URL: "http://$API_SUBDOMAIN.$DOMAIN/graphql"
52+
GRAPHQL_URL: "http://${API_SUBDOMAIN}.${DOMAIN}/graphql"
5353
# Public storage.
5454
# Access to these files is done via URLs created using:
55-
# "$PUBLIC_STORAGE_URL" + folder + "/" + filename.
56-
PUBLIC_STORAGE_URL: "http://$STORAGE_SUBDOMAIN.$DOMAIN/public/"
55+
# "PUBLIC_STORAGE_URL" + folder + "/" + filename.
56+
PUBLIC_STORAGE_URL: "http://${STORAGE_SUBDOMAIN}.${DOMAIN}/public/"
5757
# i18n.
58-
DEFAULT_LOCALE: "$DEFAULT_LOCALE"
58+
DEFAULT_LOCALE: "${DEFAULT_LOCALE}"
5959
# LogRocket.
6060
# LOGROCKET_ID
6161
# LOGROCKET_DEV_MODE_ALLOWED
@@ -66,7 +66,7 @@ services:
6666
image: thecodingmachine/php:7.4-v4-apache
6767
labels:
6868
- traefik.enable=true
69-
- traefik.http.routers.api_router.rule=Host(`$API_SUBDOMAIN.$DOMAIN`)
69+
- traefik.http.routers.api_router.rule=Host(`${API_SUBDOMAIN}.${DOMAIN}`)
7070
environment:
7171
# Docker image.
7272
# ---------------------
@@ -82,40 +82,40 @@ services:
8282
STARTUP_COMMAND_4: "php bin/console app:init-storage:s3"
8383
# Symfony.
8484
# ---------------------
85-
APP_NAME: "$APP_NAME"
85+
APP_NAME: "${APP_NAME}"
8686
APP_ENV: "dev"
8787
APP_DEBUG: "1"
8888
# Note: in your remote environments, make sure you do not change
8989
# the value of APP_SECRET between deployments. Otherwise, password
9090
# verification will not work anymore.
91-
APP_SECRET: "$APP_SECRET"
92-
COOKIE_DOMAIN: ".$DOMAIN" # The "." is important here; it tells that the cookie is available for $DOMAIN and its subdomains.
91+
APP_SECRET: "${APP_SECRET}"
92+
COOKIE_DOMAIN: ".${DOMAIN}" # The "." is important here; it tells that the cookie is available for $DOMAIN and its subdomains.
9393
# CORS.
94-
CORS_ALLOW_ORIGIN: "http://$DOMAIN" # Never use "*": https://stackoverflow.com/questions/52060784/graphql-and-csrf-protection.
94+
CORS_ALLOW_ORIGIN: "http://${DOMAIN}" # Never use "*": https://stackoverflow.com/questions/52060784/graphql-and-csrf-protection.
9595
# Logging.
9696
MONOLOG_LOGGING_PATH: "php://stderr"
9797
# Database.
98-
DATABASE_URL: "mysql://$MYSQL_USER:$MYSQL_PASSWORD@mysql:3306/$MYSQL_DATABASE?server_version=8.0"
99-
TESTS_DATABASE_URL: "mysql://$MYSQL_USER:$MYSQL_PASSWORD@mysql_tests:3306/$MYSQL_DATABASE?server_version=8.0"
98+
DATABASE_URL: "mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@mysql:3306/${MYSQL_DATABASE}?server_version=8.0"
99+
TESTS_DATABASE_URL: "mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@mysql_tests:3306/${MYSQL_DATABASE}?server_version=8.0"
100100
# Messenger.
101-
MESSENGER_TRANSPORT_DSN: "redis://$REDIS_PASSWORD@redis:6379/messages"
101+
MESSENGER_TRANSPORT_DSN: "redis://${REDIS_PASSWORD}@redis:6379/messages"
102102
# Storage.
103103
# Note: in other environments, the following values/variables might differ according
104104
# to your storage sources (see src/api/config/packages/flysystem.yaml).
105105
STORAGE_PUBLIC_SOURCE: "public.storage.s3"
106106
STORAGE_PRIVATE_SOURCE: "private.storage.s3"
107107
STORAGE_ENDPOINT: "http://minio:9000"
108-
STORAGE_PUBLIC_BUCKET: "$STORAGE_PUBLIC_BUCKET"
109-
STORAGE_PRIVATE_BUCKET: "$STORAGE_PRIVATE_BUCKET"
110-
STORAGE_ACCESS_KEY: "$STORAGE_ACCESS_KEY"
111-
STORAGE_SECRET_KEY: "$STORAGE_SECRET_KEY"
108+
STORAGE_PUBLIC_BUCKET: "${STORAGE_PUBLIC_BUCKET}"
109+
STORAGE_PRIVATE_BUCKET: "${STORAGE_PRIVATE_BUCKET}"
110+
STORAGE_ACCESS_KEY: "${STORAGE_ACCESS_KEY}"
111+
STORAGE_SECRET_KEY: "${STORAGE_SECRET_KEY}"
112112
# i18n.
113-
DEFAULT_LOCALE: "$DEFAULT_LOCALE"
113+
DEFAULT_LOCALE: "${DEFAULT_LOCALE}"
114114
# Mailer.
115115
MAILER_DSN: "smtp://null:null@mailhog:1025"
116-
MAIL_FROM_ADDRESS: "no-reply@$DOMAIN"
116+
MAIL_FROM_ADDRESS: "no-reply@${DOMAIN}"
117117
MAIL_FROM_NAME: "$APP_NAME"
118-
MAIL_WEBAPP_URL: "http://$DOMAIN/"
118+
MAIL_WEBAPP_URL: "http://${DOMAIN}/"
119119
MAIL_WEBAPP_UPDATE_PASSWORD_ROUTE_FORMAT: "%s/update-password/%s/%s" # {locale}/update-password/{resetPasswordTokenId}/{plainToken}
120120
volumes:
121121
- ./src/api:/var/www/html
@@ -124,17 +124,17 @@ services:
124124
aliases:
125125
# Required so that the web application is able to call the same endpoint
126126
# from both the browser and the server.
127-
- "$API_SUBDOMAIN.$DOMAIN"
127+
- "${API_SUBDOMAIN}.${DOMAIN}"
128128

129129
# For business data and user sessions.
130130
mysql:
131131
image: mysql:8.0
132132
command: --default-authentication-plugin=mysql_native_password
133133
environment:
134-
MYSQL_ROOT_PASSWORD: "$MYSQL_ROOT_PASSWORD"
135-
MYSQL_DATABASE: "$MYSQL_DATABASE"
136-
MYSQL_USER: "$MYSQL_USER"
137-
MYSQL_PASSWORD: "$MYSQL_PASSWORD"
134+
MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}"
135+
MYSQL_DATABASE: "${MYSQL_DATABASE}"
136+
MYSQL_USER: "${MYSQL_USER}"
137+
MYSQL_PASSWORD: "${MYSQL_PASSWORD}"
138138
volumes:
139139
- mysql_data:/var/lib/mysql
140140

@@ -143,10 +143,10 @@ services:
143143
image: mysql:8.0
144144
command: --default-authentication-plugin=mysql_native_password
145145
environment:
146-
MYSQL_ROOT_PASSWORD: "$MYSQL_ROOT_PASSWORD"
147-
MYSQL_DATABASE: "$MYSQL_DATABASE"
148-
MYSQL_USER: "$MYSQL_USER"
149-
MYSQL_PASSWORD: "$MYSQL_PASSWORD"
146+
MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}"
147+
MYSQL_DATABASE: "${MYSQL_DATABASE}"
148+
MYSQL_USER: "${MYSQL_USER}"
149+
MYSQL_PASSWORD: "${MYSQL_PASSWORD}"
150150
tmpfs:
151151
- /var/lib/mysql
152152

@@ -157,14 +157,14 @@ services:
157157
- traefik.http.routers.phpmyadmin_router.rule=Host(`phpmyadmin.$DOMAIN`)
158158
environment:
159159
PMA_HOSTS: "mysql, mysql_tests"
160-
PMA_USER: "$MYSQL_USER"
161-
PMA_PASSWORD: "$MYSQL_PASSWORD"
160+
PMA_USER: "${MYSQL_USER}"
161+
PMA_PASSWORD: "${MYSQL_PASSWORD}"
162162

163163
# For asynchronous tasks and emails.
164164
redis:
165165
image: bitnami/redis:6.0
166166
environment:
167-
REDIS_PASSWORD: "$REDIS_PASSWORD"
167+
REDIS_PASSWORD: "${REDIS_PASSWORD}"
168168
tmpfs:
169169
- /bitnami/redis/data
170170

@@ -173,7 +173,7 @@ services:
173173
image: mailhog/mailhog:latest
174174
labels:
175175
- traefik.enable=true
176-
- traefik.http.routers.mailhog_router.rule=Host(`mailhog.$DOMAIN`)
176+
- traefik.http.routers.mailhog_router.rule=Host(`mailhog.${DOMAIN}`)
177177
- traefik.http.routers.mailhog_router.service=mailhog_service
178178
- traefik.http.services.mailhog_service.loadbalancer.server.port=8025
179179

@@ -183,12 +183,12 @@ services:
183183
command: server /data
184184
labels:
185185
- traefik.enable=true
186-
- traefik.http.routers.minio_router.rule=Host(`$STORAGE_SUBDOMAIN.$DOMAIN`)
186+
- traefik.http.routers.minio_router.rule=Host(`${STORAGE_SUBDOMAIN}.${DOMAIN}`)
187187
- traefik.http.routers.minio_router.service=minio_service
188188
- traefik.http.services.minio_service.loadbalancer.server.port=9000
189189
environment:
190-
MINIO_ACCESS_KEY: "$STORAGE_ACCESS_KEY"
191-
MINIO_SECRET_KEY: "$STORAGE_SECRET_KEY"
190+
MINIO_ACCESS_KEY: "${STORAGE_ACCESS_KEY}"
191+
MINIO_SECRET_KEY: "${STORAGE_SECRET_KEY}"
192192
volumes:
193193
- minio_data:/data
194194

0 commit comments

Comments
 (0)