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
74dec72bbb
Update s6/debian-root/etc/s6-overlay/s6-rc.d/1-startup/up
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-07-15 16:28:16 +01:00
eb5c86ed3e
Try i686 version of s6 overlay for i386 container?
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-14 18:37:00 +01:00
d6dde5a1fd
shellcheck
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 16:44:11 +01:00
13c45454dd
finish service script wrapper
...
Build this branch on push?
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 16:40:04 +01:00
c82c33b5a3
Merge pull request #1142 from pi-hole/s6-3-markII
...
Upgrade to S6 overlay v3
2022-07-12 16:31:06 +01:00
6edd1fd494
Move the functionality of fix_capabilties into the pihole_FTL run script. Prevents issues when checking out a new branch of pihole-FTL inside the container
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 16:29:44 +01:00
84a497038d
Source webpage.sh anyway - in the end I don't think we will be able to get away from this without a dedicated function in the core repo (or copying the code - but I wont do that)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 15:48:12 +01:00
49062e17f1
Bump to S6 overlay v3 - and the changes that go with that...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 15:18:33 +01:00
7863fe5016
spell-check
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-11 23:59:12 +01:00
611df9b3f0
Huge tidy up/prune/refactor of the code
...
- Moves most code in start.sh into functions in bash_functions.sh
- Removes code from 20-start.sh and moves it inside start.sh
- Removes unused variables and code, making it easier to find our way around
- Removes dependency on webpage.sh, which had to be modified in order to source it properly (thus breaking pihole checkout), use utils.sh instead
- Replaces all uses of ServerIP/v6 with new FTLCONF_REPLY_ADDR4/6 variables
- No need to symlink echo to whiptail any more (probably hasn't been needed for a while)
- removes huge list of exported env vars at the top of start.sh - no longer appear to be needed
- rename some functions in bash_functions to more logical names, group their usages in start.sh
- adjust/fix tests to match changes
- remove some dead tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-11 23:50:05 +01:00
7e817b9360
Merge pull request #1140 from pi-hole/etc-pihole-files
...
Ensure creation of all needed Pi-hole files in /etc/pihole on container startup
2022-07-11 12:50:20 +01:00
2ebefaab12
Instead of downloading macvendor.db only when it does not exist, move the initially installed version to root and symlink to it to ensure it is always up to date.
...
Run installLogRotate from basic-install.sh to include the logrotate config in /etc/pihole (base image now includes logrotate)
2022-07-11 12:46:07 +01:00
970bc62836
Merge pull request #1138 from pi-hole/macvendor-mounted-volume
...
download macvendor.db on container start if it is missing
2022-07-10 17:11:09 +01:00
e13586aa1e
download macvendor.db on container start if it is missing from /etc/pihole (can happen in the case of a volume mount)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-10 16:54:22 +01:00
64c31b8374
Merge pull request #1136 from pi-hole/master
...
sync: master to dev
2022-07-10 14:32:59 +01:00
7e69551be1
Merge pull request #1135 from pi-hole/dev
...
Dev
2022-07-10 14:00:27 +01:00
8a294e875f
Merge pull request #1130 from yubiuser/skip_install
...
Rename PH_TEST to SKIP_INSTALL
2022-07-10 13:53:32 +01:00
faf8e29751
Merge pull request #1133 from casperklein/dev
...
Silent capsh error output
2022-07-09 17:45:56 +01:00
39021c66f9
Merge branch 'dev' into dev
2022-07-09 17:39:25 +01:00
a957aba602
Merge pull request #1132 from pi-hole/master
...
sync: master to dev
2022-07-09 17:38:54 +01:00
50efb1f50c
Silent capsh error output
...
Signed-off-by: Casper <casperklein@users.noreply.github.com>
2022-07-09 01:59:22 +02:00
c784963b83
Build process complaining about atomicwrites version, up to 1.4.1 and regenerate lock file (Do I sound like I know what I'm talking about...?)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-08 22:08:05 +01:00
2f0fc391c4
Merge pull request #1131 from pi-hole/dev
...
Dev -> master before tagging
2022-07-08 19:19:24 +01:00
0ec6f866cd
Merge pull request #1115 from pi-hole/var-log-pihole
...
Account for renaming/moving of log files in main repos
2022-07-08 17:33:07 +01:00
33bae3207f
Also account for renaming of pihole-FTL.log -> FTL.log
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-08 17:25:29 +01:00
9fd7719638
Rename PH_TEST to SKIP_INSTALL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:40:10 +02:00
b86db0fc3f
Merge branch 'dev' into var-log-pihole
2022-07-06 18:37:19 +01:00
795af5f87a
Merge pull request #1127 from yubiuser/fix/stale_reason
...
Fix close-issue-reason
2022-07-06 18:27:29 +01:00
d0b6c21f8f
Merge pull request #1128 from PeterDaveHelloKitchen/update-python-dependency
...
Update Python dependency - `urllib3` & `requests`
2022-07-06 18:22:12 +01:00
8153363b2d
Update Python dependency - urllib3 & requests
...
- Update urllib3 from v1.25.9 to v1.26.5
- Update requests from v2.22.0 to v2.28.1
There's a medium severity CVE in urllib3, before v1.26.5, but we can't
only just update urllib3 because there will be a dependency conflict.
requests also needs to be updated.
CVE reference:
https://www.cve.org/CVERecord?id=CVE-2021-33503
> An issue was discovered in urllib3 before 1.26.5. When provided with a
> URL containing many @ characters in the authority component, the
> authority regular expression exhibits catastrophic backtracking,
> causing a denial of service if a URL were passed as a parameter or
> redirected to via an HTTP redirect.
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-07-06 01:50:48 +08:00
8fae8a1fdc
Fix close-issue-reason
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-05 10:24:37 +02:00
d038a96f5c
Merge branch 'dev' into var-log-pihole
2022-07-04 15:40:58 +01:00
855086caa7
Update s6/debian-root/etc/services.d/pihole-FTL/run
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-07-04 15:40:53 +01:00
c3a4a832dd
Merge pull request #1126 from yubiuser/less_stale
...
Run stale workflow only once a day at 08:00
2022-07-04 15:39:36 +01:00
aacc3efc93
Run stale workflow only once a day at 08:00
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-04 16:03:16 +02:00
543adf1f64
Merge branch 'dev' into var-log-pihole
2022-07-03 19:29:39 +01:00
b1c2555528
Merge pull request #1123 from PeterDaveHelloKitchen/update-python-dependency
...
Update Python dependency - urllib3 from v1.25.8 to v1.25.9
2022-07-03 19:28:59 +01:00
afdb7a110d
Merge pull request #1125 from pi-hole/master
...
sync: master to dev
2022-07-03 19:28:36 +01:00
4e6bc66ce5
Merge pull request #1124 from pi-hole/meta/readme_support_update
...
Update README.md
2022-07-02 10:11:51 +01:00
bb99fae517
Update README.md
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-01 13:05:11 -07:00
a6d0e49ed1
Update Python dependency - urllib3 from v1.25.8 to v1.25.9
...
https://www.cve.org/CVERecord?id=CVE-2020-26137
> urllib3 before 1.25.9 allows CRLF injection if the attacker controls
> the HTTP request method, as demonstrated by inserting CR and LF
> control characters in the first argument of putrequest(). NOTE: this
> is similar to CVE-2020-26116.
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-06-30 18:44:31 +08:00
4399f41473
Merge pull request #1122 from pi-hole/master
...
sync: master to dev
2022-06-24 09:18:16 +01:00
dba2235c8d
Merge pull request #1121 from yubiuser/stale-issue-reason
...
Add stale-issue-reson: not_planned
2022-06-24 09:14:07 +01:00
b71bec2266
Add stale-issue-reson: not_planned
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-24 08:58:11 +02:00
05bf32abda
Update s6/debian-root/etc/services.d/lighttpd/run
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-06-12 17:56:47 +01:00
f17898bf6f
Also account for /var/log/lighttpd file name changes
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 13:37:39 +01:00
1900d567c9
Mop up some other references
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 13:10:12 +01:00
b7016668b4
Account for log files being moved to /var/log/pihole/
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-06-12 12:59:18 +01:00
1c369e3dea
Merge pull request #1111 from pi-hole/address-sonarr-complaints
...
Address Sonar complaints
2022-06-12 12:06:35 +01:00
Adam Warner
Casper
Christian König
Peter Dave Hello
Dan Schaper