Skip to content

Commit 1d420a2

Browse files
hawkupbestlong
authored andcommitted
Separate variable flag container path out from APP_CODE_PATH_CONTAINER (laradock#1591)
Because Container cannot volume when use APP_CODE_PATH_CONTAINER (with flag) concat with path name, e.g. /var/www:nocache/letencrypt This will fix 1540.
1 parent c7aa535 commit 1d420a2

3 files changed

Lines changed: 14 additions & 11 deletions

File tree

DOCUMENTATION/content/documentation/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,7 @@ Laradock comes with `sync.sh`, an optional bash script, that automates installin
18321832
DOCKER_SYNC_STRATEGY=native_osx
18331833
```
18341834

1835-
3) set `APP_CODE_PATH_CONTAINER=/var/www` to `APP_CODE_PATH_CONTAINER=/var/www:nocopy` in the .env file
1835+
3) set `APP_CODE_CONTAINER_FLAG` to `APP_CODE_CONTAINER_FLAG=:nocopy` in the .env file
18361836

18371837
4) Install the docker-sync gem on the host-machine:
18381838
```bash

docker-compose.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ services:
107107
- BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
108108
- BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
109109
volumes:
110-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
110+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
111111
extra_hosts:
112112
- "dockerhost:${DOCKER_HOST_IP}"
113113
ports:
@@ -164,7 +164,7 @@ services:
164164
- INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
165165
volumes:
166166
- ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
167-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
167+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
168168
expose:
169169
- "9000"
170170
extra_hosts:
@@ -197,7 +197,7 @@ services:
197197
- PUID=${PHP_WORKER_PUID}
198198
- PGID=${PHP_WORKER_PGID}
199199
volumes:
200-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
200+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
201201
- ./php-worker/supervisord.d:/etc/supervisord.d
202202
depends_on:
203203
- workspace
@@ -233,7 +233,7 @@ services:
233233
- PHP_UPSTREAM_PORT=${NGINX_PHP_UPSTREAM_PORT}
234234
- CHANGE_SOURCE=${CHANGE_SOURCE}
235235
volumes:
236-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
236+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
237237
- ${NGINX_HOST_LOG_PATH}:/var/log/nginx
238238
- ${NGINX_SITES_PATH}:/etc/nginx/sites-available
239239
- ${NGINX_SSL_PATH}:/etc/nginx/ssl
@@ -267,7 +267,7 @@ services:
267267
- PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT}
268268
- DOCUMENT_ROOT=${APACHE_DOCUMENT_ROOT}
269269
volumes:
270-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
270+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
271271
- ${APACHE_HOST_LOG_PATH}:/var/log/apache2
272272
- ${APACHE_SITES_PATH}:/etc/apache2/sites-available
273273
ports:
@@ -283,7 +283,7 @@ services:
283283
hhvm:
284284
build: ./hhvm
285285
volumes:
286-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
286+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
287287
expose:
288288
- "9000"
289289
depends_on:
@@ -536,7 +536,7 @@ services:
536536
caddy:
537537
build: ./caddy
538538
volumes:
539-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
539+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
540540
- ${CADDY_CONFIG_PATH}:/etc/caddy
541541
- ${CADDY_HOST_LOG_PATH}:/var/log/caddy
542542
- ${DATA_PATH_HOST}:/root/.caddy
@@ -909,7 +909,7 @@ services:
909909
build:
910910
context: ./aws
911911
volumes:
912-
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
912+
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
913913
depends_on:
914914
- workspace
915915
tty: true

env-example

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
# Point to the path of your applications code on your host
88
APP_CODE_PATH_HOST=../
99

10-
# Point to where the `APP_CODE_PATH_HOST` should be in the container. You may add flags to the path `:cached`, `:delegated`. When using Docker Sync add `:nocopy`
11-
APP_CODE_PATH_CONTAINER=/var/www:cached
10+
# Point to where the `APP_CODE_PATH_HOST` should be in the container
11+
APP_CODE_PATH_CONTAINER=/var/www
12+
13+
# You may add flags to the path `:cached`, `:delegated`. When using Docker Sync add `:nocopy`
14+
APP_CODE_CONTAINER_FLAG=:cached
1215

1316
# Choose storage path on your machine. For all storage systems
1417
DATA_PATH_HOST=~/.laradock/data

0 commit comments

Comments
 (0)