Adam Warner
83e918efb9
Rebase on development-v6, roll in changes based on comments by @yubiuser
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-12-23 12:47:57 +00:00
Adam Warner
69807c04e8
Attempt to download FTL before cloning the other component repos
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-12-23 12:40:16 +00:00
Adam Warner
8549432d67
Fail hard if TARGETPLATFORM does not meet one of the predefined values
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-12-23 12:40:16 +00:00
Christian König
dbf3ddfa24
Update alpine to 3.19
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-16 23:23:21 +01:00
Christian König
8a6bda4a89
Create dir for logrotate statefile
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-03 22:05:29 +01:00
Christian König
06819bdd51
Install logrotate
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-31 21:16:05 +01:00
Christian König
752c49e5de
Install logrotate from repo
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-30 23:31:40 +01:00
Adam Warner
b688b46f13
linux/arm64/v8 should be linux/arm64.
...
This is a regression, added a note to make sure it does not happen again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-30 21:22:18 +00:00
Adam Warner
5c7ff5c539
TARGETPLATFORM needs to be set
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-22 22:14:31 +01:00
Adam Warner
6fa1759814
AdminLTE -> web
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:06:35 +01:00
Adam Warner
94795db7e9
correct tini path
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:38:49 +01:00
Adam Warner
3cebec9344
Add tini anyway (see `tini + bash 4.x at https://ahmet.im/blog/minimal-init-process-for-containers/ )
...
bash isn't going anywhere for the time being
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:20:12 +01:00
Christian König
81e7671441
Revert alias and make branch configurable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-02 22:20:20 +02:00
Christian König
d89d826951
Add padd alias
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-01 21:29:30 +02:00
Christian König
76b6d5bdb4
Add PADD to the image
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-07-31 23:38:39 +02:00
Adam Warner
e88985ba40
This is not needed!
...
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-28 21:58:48 +01:00
Dan Schaper
9a058c5511
Alphebetize dependencies for organization.
2023-07-28 10:10:10 -07:00
Gontier Julien
dfdf5fa930
Tell alpine specifically to use procps-ng
...
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
2023-07-28 17:17:51 +02:00
Adam Warner
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
Adam Warner
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
edgd1er
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
edgd1er
926b3ae8c6
fix arm64 arch. use copy --chmod
2023-07-24 00:39:02 +02: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
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
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
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
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
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
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
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
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
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
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
d7a25836ad
checkpoint
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-15 23:48:53 +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
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
RD WebDesign
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