Docs for using multiple compose files #2290
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -37,7 +37,7 @@ GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null) | |||
| default: docs | |||
|
|
|||
| docs: docs-build | |||
| $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) | |||
| $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) --watch | |||
There was a problem hiding this comment.
cc @SvenDowideit as well on this change. I'm pretty sure the old setup wasn't setting the correct volume path. With this I was able to see my changes immediately by just refreshing.
I hear hugo does livereload as well, but I don't see it injecting the livereload.js
dnephin
force-pushed
the
docs_multi_file_compose
branch
2 times, most recently
from
921f3ce
to
d688965
Compare
|
Ok, "We" is now purged from the docs |
|
LGTM Thank you Daniel. |
| service, the local value either *override*s or *extend*s the definition of the | ||
| original service. This works differently for other configuration options. | ||
| If a configuration option is defined in both the original service the local | ||
| service, the local value *replaces* or *rextends* the original value. |
dnephin
force-pushed
the
docs_multi_file_compose
branch
2 times, most recently
from
4c37a92
to
f5b8c3f
Compare
Start restructuring extends docs in preparation for adding documentation about using multiple compose files. Signed-off-by: Daniel Nephin <dnephin@docker.com>
…e refreshed. Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
dnephin
force-pushed
the
docs_multi_file_compose
branch
from
f5b8c3f
to
e503e08
Compare
|
LGTM |
aanand
added a commit
that referenced
this pull request
Nov 3, 2015
Docs for using multiple compose files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2141, #2289, also related to #1784 and #1786
cc @moxiegirl , @bfirsh