docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-30 21:20:59 +02:00
Code Issues Releases Wiki Activity
1,625 Commits 10 Branches 115 Tags 4.8 MiB
4471863464
Commit Graph

1625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
4471863464
Merge pull request #1395 from pi-hole/v6/docker_tag 
re-add the PIHOLE_DOCKER_TAG build arg that went missing along the way
 2023-07-23 23:30:30 +01:00
Adam Warner
e352c6b2ac
re-add the PIHOLE_DOCKER_TAG build arg that went missing along the way 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-23 18:45:06 +01:00
Adam Warner
3b5cf34036
Merge pull request #1384 from pi-hole/v6/branch-args 
Allow branch names to be passed in as build args
 2023-07-21 19:05:42 +01:00
Adam Warner
46adac81d3
Merge pull request #1392 from pi-hole/v6/add-ncurses 
Add `ncurses` back in for the time being to fix pihole -v output.
 2023-07-20 19:23:11 +01:00
Adam Warner
8cc91c5ae5
Add ncurses back in for the time being to fix pihole -v output. It was removed in #1366. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-20 19:20:32 +01:00
Adam Warner
bf414721e0
Allow branch names to be passed through as ARGs default development-v6 (for now) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-20 18:26:13 +01:00
Adam Warner
41511c5881
Merge pull request #1391 from Gontier-Julien/reduce-git-size 
Reduce git clone size, by cloning only what is needed
 2023-07-20 18:23:55 +01:00
Gontier Julien
e4b5da2f6d Reduce git clone size by only cloning what is needed 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-19 20:44:52 +02:00
Adam Warner
348e27b45f
Merge pull request #1368 from pi-hole/reimplement-skip-gravity 
Re-implement SKIPGRAVITYONBOOT
 2023-07-17 17:37:23 +01:00
Adam Warner
d5b639daee
Merge pull request #1366 from pi-hole/tweak/remove_deps 
Remove some unnessacery dependencies
 2023-07-17 17:36:52 +01:00
Adam Warner
a3a199cb47
Merge pull request #1382 from Gontier-Julien/ADD-to-COPY 
Change so ADD to COPY following docker best practices
 2023-07-16 19:07:02 +01:00
Adam Warner
91f07711d0
Merge pull request #1381 from Gontier-Julien/development-v6 
Remove one layer by having both git clone together
 2023-07-16 19:05:47 +01:00
Snow
030e375386
add a space between && and \ for readability 
Make it consistence with other multi-line commands.

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Snow <52894530+Gontier-Julien@users.noreply.github.com>
 2023-07-16 12:14:56 +02:00
Gontier Julien
1a1e4cecb7 Change so ADD to COPY following best practices 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-15 23:29:58 +02:00
Gontier Julien
f15640505c Remove one layer by having both git clone together 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-15 23:13:11 +02:00
Adam Warner
794ed20edf
Merge pull request #1374 from pi-hole/dependabot/github_actions/development-v6/docker/build-push-action-4 
Bump docker/build-push-action from 3 to 4
 2023-07-12 21:49:40 +01:00
dependabot[bot]
52f098c269
Bump docker/build-push-action from 3 to 4 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-12 20:48:11 +00:00
Adam Warner
6403bb5962
Merge pull request #1373 from pi-hole/dependabot/github_actions/development-v6/actions/stale-8.0.0 
Bump actions/stale from 7.0.0 to 8.0.0
 2023-07-12 21:40:29 +01:00
dependabot[bot]
e3c9b90c6d
Bump actions/stale from 7.0.0 to 8.0.0 
Bumps [actions/stale](https://github.com/actions/stale) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v7...v8.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-12 20:35:45 +00:00
Adam Warner
da1d135eea
remove erroneous push 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-12 21:34:55 +01:00
Adam Warner
e20f1a707a
and push-by-digest 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-12 19:47:37 +01:00
Adam Warner
f739dca323
Don't log in or push on pull request 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-12 19:30:23 +01:00
Adam Warner
11b6b8bd34
Remove some dependencies, move nano & less to the start script and only intall if env var INSTALL_DEV_TOOLS > 0 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 19:15:52 +01:00
Adam Warner
5d33fdadd3
reimplement allowing user to skip gravity on boot with the environment variable SKIPGRAVITYONBOOT (as with v5) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 19:15:37 +01:00
Adam Warner
8325612ce4
Merge pull request #1367 from pi-hole/fix/build 
Remove the old build process (Fixes PR builds on `development-v6`)
 2023-07-11 19:14:26 +01:00
Adam Warner
d3c343a01f
Remove the old build process 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-10 23:48:18 +01:00
Adam Warner
ef03be0d36
Helps if we replace _all_ references 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-10 23:32:10 +01:00
Adam Warner
b44c052b9b
Target development-v6 instead of v6-alpine-play 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-10 23:23:25 +01:00
Adam Warner
5435c9d6c1
Start FTL after running gravity completely. Else we end up in a situation where the database getss stuck in readonly 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-09 17:09:32 +01:00
Adam Warner
c89d5d1286
Minor formatting tweaks 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-09 17:02:38 +01:00
Adam Warner
d415bffcb7
Create our own cron file rather than copying the one from the core repo (which contains non-standard cron syntax) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 22:54:49 +01:00
Adam Warner
cc3789df21
Attempt to reduce code reuse in action 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 22:01:44 +01:00
Adam Warner
56e2db6cff
Too many actions with the same name.. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 20:30:10 +01:00
Adam Warner
67fc0a4a98
Tidy up action a little, add in missing GHCR meta 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 20:23:45 +01:00
Adam Warner
38bd86202b
Clarify output of action 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 19:15:36 +01:00
Adam Warner
0f15d7b3ac
Remove duplicate APKs 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 19:15:27 +01:00
Adam Warner
194fe3121f
Add nano and less to the image 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 19:06:55 +01:00
Adam Warner
1a09d39444
chown the macvendor that we copied to root 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-29 17:25:08 +01:00
Adam Warner
a5c8e6d873
Run pihole update checked on container start 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-29 17:24:56 +01:00
Adam Warner
45c636eb25
Use pihole-FTL prestart script from core repo to avoid code duplication. Change the order of startup objects a little. 
look at starting crond on startup

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-21 19:18:12 +01:00
Adam Warner
2e5998175b
Yolo 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-19 22:44:22 +01:00
Adam Warner
05466f9c14
Lets not overwite an existing image... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-19 21:40:13 +01:00
Adam Warner
452e0ca072
Add some arch detection into the dockerfile. 
This seems to build locally, lets see what GHA does with it

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-19 21:39:24 +01:00
RD WebDesign
7c48cd548f
Fix typo wi1th to with 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-06-18 19:10:46 -03:00
RD WebDesign
c21a85ed58
Use the new development-v6 branches for all repos 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-06-18 19:09:34 -03:00
Adam Warner
171c8108f9
Remove the s6 directory to prevent confusion. I will try to remember where I was with the previous commit. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-09 18:53:42 +01:00
Adam Warner
d7a25836ad
checkpoint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-15 23:48:53 +00:00
Adam Warner
382367f968
Get config options from pihole-FTL directly 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-11 13:59:28 +00:00
Adam Warner
4ec50469c7
!!!BREAKING!!! Use this as an oppurtunity to tidy up/uniform the environment variables. Most things can be set directly in pihole.toml these days, so will convert variables in the format of FTLCONF_key or FTLCONF_key_subkey etc into key or key.subkey respectively and apply them to the config 
This also takes away a lot of the error handling - but that should likely be in FTL if anywhere, anyway. Vastly simplifies startup in docker

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:01:19 +00:00
Adam Warner
7d93b94a53
Allow setting custom WEB_PORT to 80 (todo: Look at a new catchall for FTL config settings) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00