Docker: Fix building x-pack references #664
Merged
Conversation
This file contains hidden or 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
Fixes building the x-pack reference books with `--doc`. They require a special directory layout that `build_docs.pl` relied on the user to build manually. `build_docs` builds the docker filesystem agnostic of the user's filesystem and without this change would stuff all of the source repos into `/doc` in the docker image. For example, the `elasticsearch` and `x-pack-elasticsearch` repo expect to be layed out like this: ``` + elasticsearch \ elasticsearch-extra + x-pack-elasticsearch ``` but docker was putting them in `/docs/elasticsearch` and `/docs/x-pack-elasticsearch`. This changes how they are mounted in the docker image so they'll build. Now all repos with names like `x-pack-foo` are mounted in `foo-extra`. This isn't the cleanest thing in the world, but I expect we can revert it once we no longer have to support building the docs outside of docker.
ddillinger
approved these changes
Mar 5, 2019
It wasn't as weird as it sounds because to hack on the repo you had to check them out that way too..... |
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.
Fixes building the x-pack reference books with
--doc. They require aspecial directory layout that
build_docs.plrelied on the user tobuild manually.
build_docsbuilds the docker filesystem agnostic ofthe user's filesystem and without this change would stuff all of the
source repos into
/docin the docker image.For example, the
elasticsearchandx-pack-elasticsearchrepo expectto be layed out like this:
but docker was putting them in
/docs/elasticsearchand/docs/x-pack-elasticsearch.This changes how they are mounted in the docker image so they'll build.
Now all repos with names like
x-pack-fooare mounted infoo-extra.This isn't the cleanest thing in the world, but I expect we can revert
it once we no longer have to support building the docs outside of
docker.
Relates to #653.