Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
9b8d4806
Unverified
Commit
9b8d4806
authored
Nov 22, 2017
by
Mahmoud Zalt
Committed by
GitHub
Nov 22, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1265 from jeff-h/master1
Specifying included docker-compose files in the .env is more flexible
parents
65a8bbc6
73b95357
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
env-example
env-example
+3
-0
sync.sh
sync.sh
+1
-1
No files found.
env-example
View file @
9b8d4806
...
...
@@ -7,6 +7,9 @@
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
# Replace the above with the following line if you wish to use docker-sync.
# COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
### Application Path ###################################################################################################
# Point to your code, will be available at `/var/www`.
...
...
sync.sh
View file @
9b8d4806
...
...
@@ -59,7 +59,7 @@ if [ "$1" == "up" ] ; then
print_style
"Initializing Docker Compose
\n
"
"info"
shift
# removing first argument
docker-compose
-f
docker-compose.yml
-f
docker-compose.sync.yml
up
-d
${
@
}
docker-compose up
-d
${
@
}
elif
[
"
$1
"
==
"down"
]
;
then
print_style
"Stopping Docker Compose
\n
"
"info"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment