Templatize and fix builders #19
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
The Dockerfile in the -builder directories is exactly the same except for which DISTRO-base it is pulling from. Given this, it makes sense to use a template and populate all of them based on the same template. Signed-off-by: brian avery <[email protected]>
This commit removes the Dockerfiles from the -builder directories and relies on build_containers.sh populating the Dockerfiles from the dockerfiles/templates/Dockerfile.builder. All the files are the same except for which -base distro they pull from. A README is also added to the -builder directories to discourage people from putting Dockerfiles there as the current logic will just overwrite them. Signed-off-by: brian avery <[email protected]>
The Dockerfiles in the -builder directories are now generated from a template. We want git to ignore those so they do not get accidentally checked in. Signed-off-by: brian avery <[email protected]>
runbitbake.py is an executable entry point. We were running it out of /home/yoctouser, but this breaks on redhat derived distributions when we changed the smoke tests to run as the host user id. This commit moves it to a globally accessible location. Signed-off-by: brian avery <[email protected]>
incandescant
approved these changes
Jul 18, 2017
| @@ -51,6 +51,9 @@ cd - | |||
| # can modify the Dockerfile to use whatever REPO is in the environment. | |||
| TAG=$DISTRO_TO_BUILD-builder | |||
| dockerdir=`find -name $TAG` | |||
| # use the builder template to populate the distro specific Dockerfile | |||
| cp dockerfiles/templates/Dockerfile.builder $dockerdir/Dockerfile | |||
| sed -i "s/DISTRO_TO_BUILD/$DISTRO_TO_BUILD/g" $dockerdir/Dockerfile | |||
There was a problem hiding this comment.
Why the sed & cp, why not
sed "s/DISTRO_TO_BUILD/$DISTRO_TO_BUILD/g" dockerfiles/templates/Dockerfile.builder > $dockerdir/Dockerfile
Probably not worth changing the patch just for this.
| @@ -0,0 +1,2 @@ | |||
| The Dockerfile for this directory is autogenerated based on dockerfiles/templates/Dockerfile.builder | |||
| Do not place an actual Dockerfile here. | |||
There was a problem hiding this comment.
We should add the -builder directories to the gitignore, that will discourage people from putting Dockerfiles there and help avoid the generated files being added to the repo.
| @@ -1,3 +1,4 @@ | |||
| dockerfiles/*/*/*-builder/Dockerfile | |||
There was a problem hiding this comment.
based on incandescant review, merging...
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.
This is a pretty big change. I figured out why all the redhat builders were breaking and didnt want to change each one. In short, this