Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify Dockerfile configuration. #594

Merged
merged 1 commit into from May 27, 2020

Conversation

lightswitch05
Copy link
Member

@lightswitch05 lightswitch05 commented Mar 30, 2020

Simplify Dockerfile configuration by dropping the various Dockerfile flavors.

Description

  • Simplify docker builds by consolidating all arch's into a single Dockerfile and using ARGS for the various differences
  • Introduce docker-compose based builds (build.yml) for simple management of the various args differences

Motivation and Context

My original goal tonight was to introduce GitHub actions, but I quickly realized there is a lot of moving parts with this build. After some investigation, it seemed some complexities could be simplified - particularly with the various Dockerfile flavors.

How Has This Been Tested?

Just running local builds. While I did switch the build tool from plain Docker to docker-compose - I tried to keep the Dockerfile.py interface untouched to reduce further complications.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Refactor (non-breaking changes which cleans up the code)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

☝️ I've changed the build logic, but I think that falls outside of the 'documentation' category.

@lightswitch05 lightswitch05 force-pushed the feature/consolidate-dockerfiles branch from 20b78f7 to d4c3a50 Compare Mar 30, 2020
@diginc
Copy link
Member

@diginc diginc commented May 11, 2020

Sorry about the conflicts, could you merge dev in?

@lightswitch05
Copy link
Member Author

@lightswitch05 lightswitch05 commented May 15, 2020

Sorry, I just saw this @diginc - no problem!

* Simplify docker builds by consolidating all arch's into a single Dockerfile and using ARGS for various differences
* Introduce docker-compose based builds (build.yml) for simple management of the various args differences

Signed-off-by: Daniel <daniel@developerdan.com>
@lightswitch05 lightswitch05 force-pushed the feature/consolidate-dockerfiles branch from d4c3a50 to 6939ea0 Compare May 15, 2020
@lightswitch05
Copy link
Member Author

@lightswitch05 lightswitch05 commented May 15, 2020

Conflicts fixed. I know there has been some discussions about building multi-arch images and issues with manifests. This change does introduce docker-compose as the build tool (build.yml), but it wouldn't be a major change to switch back to a pure docker build. Compose is just nice for managing the different build args and not a requirement. As far as ./Dockerfile.py goes, its an implementation change and not a interface change.

@lightswitch05
Copy link
Member Author

@lightswitch05 lightswitch05 commented May 27, 2020

I might do some more work in this project in the coming days. I’d like to base that work on these changes. Anything particular holding this back? Or just things moving slowly?

diginc
diginc approved these changes May 27, 2020
@diginc diginc merged commit 8e409bd into pi-hole:dev May 27, 2020
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants