cecf8e0954
Add tini. It really was as simple as that....
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-26 21:35:55 +01:00
62dd8d503c
Allow the for changing of the UID/GID of the user/group pihole
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-26 08:25:08 +01:00
93826e2d1d
Add tzdata package so that users can define their own timezone at runtime
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 00:12:46 +01:00
45bbb490d0
Update src/Dockerfile
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-24 00:43:21 +02:00
926b3ae8c6
fix arm64 arch. use copy --chmod
2023-07-24 00:39:02 +02:00
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
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
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
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
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
d5b639daee
Merge pull request #1366 from pi-hole/tweak/remove_deps
...
Remove some unnessacery dependencies
2023-07-17 17:36:52 +01:00
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
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
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
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
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
c89d5d1286
Minor formatting tweaks
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-09 17:02:38 +01:00
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
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
0f15d7b3ac
Remove duplicate APKs
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 19:15:27 +01:00
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
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
2e5998175b
Yolo
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-19 22:44:22 +01:00
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
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
d7a25836ad
checkpoint
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-15 23:48:53 +00:00
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
99ccda1e7f
use PADD from the PADD_FTLv6 branch
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
45f2d2dad6
switch out the base image for debian with for now - fewer packages pre-installed than the pihole base image
2023-02-10 23:00:54 +00:00
d7ff34fd74
Instead of including a static config file for redirecting it - dynamically create this file on container start.
...
This gets rid of what was probably a hack to have the VIRTUAL_HOST declared as an empty string in the Dockerfile (lighttpd would not start if env.VIRTUAL_HOST was not set
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-23 23:20:30 +00:00
61bd3c756a
I don't know why PHP_ENV_CONFIG is an environment variable. We don't need it to be
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-18 15:26:29 +00:00
4c240a43d2
Introduce an additional lighttpd config file to redirect the IP address and VIRTUAL_HOST to /admin/
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-15 23:48:34 +00:00
a58b1c08bd
Change `PHP_ENV_CONFIG` and `setup_web_php_env()`
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-15 17:12:05 -03:00
f20a0d448c
Add to /usr/local/bin and drop the .sh. Can now be called with `padd`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 16:16:29 +00:00
fbef9727c1
Update Dockerfile
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
201303a56a
ADD padd.sh to the container root
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
f94fb54a18
Some of these should not be user overridable
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-19 21:46:46 +01:00
27980ed9cf
Prevent S6 timeouts on container start by setting S6_CMD_WAIT_FOR_SERVICES_MAXTIME to 0, per https://github.com/just-containers/s6-overlay/issues/452
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 16:33:41 +01:00
e6d4c3091f
Move all scripts to /usr/local/bin to simplify dockerfile
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:48:07 +01:00
8619de0031
Revert change that removed the moving of /init to /s6-init. Add comments to make sure it does not get removed again
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-25 19:31:21 +01:00
cb38190b50
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 21:42:29 +01:00
1d59f257ff
Reorganise the repository
...
Simplify the test suite now that we use buildx to build the final image
Remove tests that were never run/skipped in previous runs (same number of tests passing as were before)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-15 17:43:09 +01:00
Adam Warner
edgd1er
Gontier Julien
Snow
RD WebDesign