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

Update Dockerfile #1552

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Update Dockerfile #1552

merged 1 commit into from
Mar 27, 2024

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

Taking inspiration from docker/cli#1134 (comment), this PR updates the Dockerfile to allow for optional building of the image with a pre-built pihole-FTL binary (one must first build FTL locally and copy to the src directory)

Also adds in build.sh to make it easier to build locally, and the Readme has been updated to show it's usage.


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

…er pull FTL from the web, or use a locally built copy.

Add a build script for ease of local building (separate from the build-and-test script).
Update Readme with build instructions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux requested a review from a team March 16, 2024 02:02
@PromoFaux PromoFaux merged commit 2004ba2 into development-v6 Mar 27, 2024
6 checks passed
@PromoFaux PromoFaux deleted the v6/buildkit-fancyness branch March 27, 2024 18:52
@Gontier-Julien
Copy link

Just as some info @PromoFaux ^^
I don't know if it come from that PR but since yesterday pi-hole v6 docker build are failing on GitHub action.
Seems to be related to riscv build apparently.

@DL6ER
Copy link
Member

DL6ER commented Mar 28, 2024

[...] but since yesterday pi-hole v6 docker build are failing on GitHub action.
Seems to be related to riscv build apparently.

pi-hole/FTL#1924

@PromoFaux
Copy link
Member Author

Just triggered the V6 image build again and it has succeeded

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

4 participants