Commit Graph

  • f60e95838b
    Merge pull request #1599 from pi-hole/tweak/386-workaround dev Adam Warner 2024-06-15 17:53:58 +0100
  • eda9fdcf8d
    fall back to using dpkg when arch is detected as x86_64 to make sure we're not really on an i386 image to prevent wrong s6 overlay version being downloaded on a 32 bit image Adam Warner 2024-06-15 16:55:02 +0100
  • 56c110a2cc
    Merge pull request #1598 from alexis-opolka/master development-v6 Adam Warner 2024-06-12 13:11:19 +0100
  • ecdaa43033 Update github user reference alexis-opolka 2024-06-12 03:25:36 +0200
  • b799ee35f5
    Merge pull request #1597 from pi-hole/dependabot/pip/test/dev/pytest-8.2.2 yubiuser 2024-06-08 14:33:08 +0200
  • 13af8e5c60
    Bump pytest from 8.2.1 to 8.2.2 in /test dependabot[bot] 2024-06-08 10:48:07 +0000
  • 80c829965b
    Merge pull request #1596 from pi-hole/new/ntp Dominik 2024-06-08 11:14:22 +0200
  • 63f36bfdd5
    Add CAP_SYS_TIME in the container if available DL6ER 2024-06-08 11:04:52 +0200
  • 194610dab7
    Merge 3579bbffec into f77e922a89 Torsten Mattetat 2024-06-06 06:29:46 +0200
  • 3579bbffec
    fix minor spell and grammar issues in README.md Torsten Mattetat 2024-06-06 06:14:43 +0200
  • 60d8067d75
    Merge pull request #1594 from pi-hole/tweak/readme Adam Warner 2024-06-05 21:17:50 +0100
  • f34c9c8c45
    Update DNS upstream servers in quick start compose example to use semicolon as separator Adam Warner 2024-06-05 21:03:40 +0100
  • 435ab307ed
    Merge pull request #1593 from pi-hole/v6/readme Adam Warner 2024-06-02 15:53:18 +0100
  • d44789054c
    Add note about FTL reverting to default if env var is unset Adam Warner 2024-06-02 15:24:55 +0100
  • 259e3bd755
    Remove no-longer-existing env variable from Advanced Variables section Adam Warner 2024-06-02 15:23:04 +0100
  • ee6e970768
    Merge pull request #1592 from pi-hole/dependabot/pip/test/dev/pytest-testinfra-10.1.1 yubiuser 2024-06-01 13:04:49 +0200
  • 0f530a6ee6
    Merge pull request #1591 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2 yubiuser 2024-06-01 13:04:04 +0200
  • a641a8f399
    Merge pull request #1590 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.2 yubiuser 2024-06-01 13:01:34 +0200
  • 0b08884bcb
    Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test dependabot[bot] 2024-06-01 10:40:10 +0000
  • 42fab8748b
    Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 dependabot[bot] 2024-06-01 10:35:42 +0000
  • 70f9bfe3f1
    Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 dependabot[bot] 2024-06-01 10:26:23 +0000
  • 675f479206
    Merge 2d4fcb90a6 into f77e922a89 Joe Gatt 2024-05-30 21:22:52 -0400
  • 2d4fcb90a6
    Merge branch 'master' into fix-adlist-env Joe Gatt 2024-05-30 21:22:49 -0400
  • 7e5daa3667
    Merge pull request #1589 from pi-hole/master Adam Warner 2024-05-30 13:09:03 +0100
  • f77e922a89
    Merge pull request #1588 from pi-hole/dev master Adam Warner 2024-05-30 13:07:49 +0100
  • ad108fee3f
    Merge branch 'master' into dev Adam Warner 2024-05-30 13:06:27 +0100
  • 55a5e990f1
    Update README.md Aaron Rodrigues 2024-05-30 13:51:58 +0200
  • be48e1186b
    Merge pull request #1586 from pi-hole/fix/build.sh_help Adam Warner 2024-05-28 09:28:26 +0100
  • d7418575e8
    Add forgotten `--load` argument to the help text RD WebDesign 2024-05-27 22:09:45 -0300
  • 1aab66d64c
    Allow arguments in any order and include new options arguments_any_order RD WebDesign 2024-05-27 20:32:49 -0300
  • 0b8ad5cc99
    Merge pull request #1585 from pi-hole/tweak/build.sh Adam Warner 2024-05-27 23:05:33 +0100
  • 4c8066a9e0
    Change default value of PIHOLE_DOCKER_TAG in dockerfile Adam Warner 2024-05-27 22:39:55 +0100
  • 7442d19e46
    Merge pull request #1583 from pi-hole/tweak/build.sh Adam Warner 2024-05-27 18:20:57 +0100
  • fdfc6ce036
    Update DOCKER_BUILD_CMD in build.sh to include the "--load" flag Adam Warner 2024-05-27 18:05:20 +0100
  • 268434973d
    Merge pull request #1582 from pi-hole/dependabot/pip/test/dev/pytest-8.2.1 yubiuser 2024-05-25 21:54:27 +0200
  • 6f0bbb7153
    Fix codespell Christian König 2024-05-25 21:51:50 +0200
  • 3a76e3245f
    Bump pytest from 8.2.0 to 8.2.1 in /test dependabot[bot] 2024-05-25 10:29:53 +0000
  • 6335fb6b41 Add ENV variable for ConfigMap for adlists gattjoe 2024-05-14 16:11:07 -0400
  • 6657818f35
    Merge pull request #1579 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.1 yubiuser 2024-05-11 14:30:28 +0200
  • 8eb20a7c64
    Merge pull request #1580 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.1 yubiuser 2024-05-11 14:27:01 +0200
  • c17f6bf671
    Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 dependabot[bot] 2024-05-11 10:27:57 +0000
  • 05c305b4af
    Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 dependabot[bot] 2024-05-11 10:18:26 +0000
  • d2e46f3cec
    Merge pull request #1576 from pi-hole/fix/grep-version Adam Warner 2024-05-09 08:42:57 +0100
  • a49600e63d
    Install grep to avoid issues in pihole -w/b with the default busybox grep Adam Warner 2024-05-08 21:50:33 +0100
  • 7253da15bd
    Merge pull request #1575 from pi-hole/dependabot/pip/test/dev/pytest-8.2.0 yubiuser 2024-05-04 13:11:38 +0200
  • 51f126108f
    Bump pytest from 8.1.2 to 8.2.0 in /test dependabot[bot] 2024-05-04 10:58:00 +0000
  • 2ad89055a6
    Merge pull request #1574 from pi-hole/dependabot/pip/test/dev/pytest-xdist-3.6.1 yubiuser 2024-05-04 12:57:06 +0200
  • 6990b09aa5
    Bump pytest-xdist from 3.5.0 to 3.6.1 in /test dependabot[bot] 2024-05-04 10:32:42 +0000
  • a0a24306d9
    Merge pull request #1559 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.0 Adam Warner 2024-04-28 15:36:33 +0100
  • 007dc8018f
    Merge pull request #1556 from pi-hole/dependabot/github_actions/dev/Chizkiyahu/delete-untagged-ghcr-action-4 Adam Warner 2024-04-28 15:36:23 +0100
  • c2887aeffe
    Merge pull request #1567 from pi-hole/dependabot/pip/test/pip-150d523057 2024.05.0 Adam Warner 2024-04-28 15:36:02 +0100
  • 4b9a8cabf6
    Merge pull request #1572 from pi-hole/dependabot/pip/test/dev/black-24.4.2 yubiuser 2024-04-27 12:52:36 +0200
  • 94cb08a972
    Bump black from 24.4.0 to 24.4.2 in /test dependabot[bot] 2024-04-27 10:50:34 +0000
  • 0b0db714a4
    Merge pull request #1571 from pi-hole/dependabot/pip/test/dev/pytest-8.1.2 yubiuser 2024-04-27 12:49:33 +0200
  • 0d64bb5665
    Bump pytest from 8.1.1 to 8.1.2 in /test dependabot[bot] 2024-04-27 10:16:10 +0000
  • 9973fd9bf8
    Merge pull request #1569 from lemondjeff/development-v6-issue-1562-take2 Adam Warner 2024-04-21 14:22:30 +0100
  • e239b1cae6 Remove obsolete "version" value from example docker-compose.yml in README.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented." Jeff Miller 2024-04-19 16:29:58 -0700
  • 0215004b1f
    Merge branch 'development-v6' into development-v6-issue-1562 lemondjeff 2024-04-20 15:47:37 -0700
  • 6fcc5e5bad
    Merge branch 'development-v6' into development-v6-issue-1562 lemondjeff 2024-04-20 15:47:03 -0700
  • 36c4118bc4 Remove obsolete "version" value from example docker-compose.yml in README.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented." Jeff Miller 2024-04-19 16:29:58 -0700
  • 7e5ab408ca
    Merge pull request #1563 from lemondjeff/dev Adam Warner 2024-04-20 16:31:49 +0100
  • b033a18a24 Remove obsolete "version" value from example docker-compose.yml in README.md and from .yml files in examples since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented." Jeff Miller 2024-04-01 16:07:03 -0700
  • 0fd3ae682a
    Merge pull request #1554 from pi-hole/dependabot/pip/test/dev/pytest-8.1.1 Adam Warner 2024-04-18 19:56:27 +0100
  • 2783e38030
    Bump pytest from 8.0.2 to 8.1.1 in /test dependabot[bot] 2024-04-18 18:54:26 +0000
  • 897baa69f0
    Merge pull request #1558 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0 Adam Warner 2024-04-18 19:53:32 +0100
  • 2cfebe2cdf
    Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 dependabot[bot] 2024-04-18 17:04:40 +0000
  • 4d68ee6af6
    Merge pull request #1557 from shamoon/patch-1 Adam Warner 2024-04-18 17:59:31 +0100
  • 13a04a7705
    Merge pull request #1566 from pi-hole/dependabot/pip/test/dev/black-24.4.0 Adam Warner 2024-04-18 17:55:51 +0100
  • daf1e568bb
    Bump the pip group across 1 directory with 3 updates dependabot[bot] 2024-04-18 15:45:21 +0000
  • e5e6a2945b
    Bump black from 24.2.0 to 24.4.0 in /test dependabot[bot] 2024-04-13 10:22:16 +0000
  • 4b1693b5f7
    Bump the pip group across 1 directory with 3 updates dependabot[bot] 2024-04-12 04:48:11 +0000
  • db20909579
    Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 dependabot[bot] 2024-03-30 10:36:19 +0000
  • 1b6469ba74
    Fix: correct dns upstreams variable name shamoon 2024-03-28 11:40:01 -0700
  • 2004ba2515
    Merge pull request #1552 from pi-hole/v6/buildkit-fancyness Adam Warner 2024-03-27 18:52:10 +0000
  • 6c3b1e77bd
    Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4 dependabot[bot] 2024-03-23 10:54:36 +0000
  • 042c81f8e0
    Bump black from 24.1.1 to 24.3.0 in /test dependabot[bot] 2024-03-20 18:10:47 +0000
  • 00ed068828
    Bump black from 24.2.0 to 24.3.0 in /test dependabot[bot] 2024-03-16 10:51:57 +0000
  • 292a6b961c
    Update Dockerfile to use a nifty buildkit feature allowing us to either 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 Adam Warner 2024-03-16 01:56:35 +0000
  • cdded14041
    Merge pull request #1551 from pi-hole/v6/basic-tweaks Adam Warner 2024-03-16 01:03:39 +0000
  • 24006c7a00
    Address comments. Adam Warner 2024-03-11 18:14:26 +0000
  • 9fefa11c41
    Tidy up a few things in the readme and code. Adam Warner 2024-03-10 19:29:38 +0000
  • 061251e599
    Merge pull request #1541 from pi-hole/dependabot/pip/test/dev/pytest-testinfra-10.1.0 yubiuser 2024-03-02 13:01:15 +0100
  • 146dc52b0b
    Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test dependabot[bot] 2024-03-02 11:59:23 +0000
  • 2bb820bec9
    Merge pull request #1542 from pi-hole/dependabot/pip/test/dev/black-24.2.0 yubiuser 2024-03-02 12:58:11 +0100
  • 23b3a42b78
    Bump black from 24.1.1 to 24.2.0 in /test dependabot[bot] 2024-03-02 11:51:51 +0000
  • f073ab3145
    Merge pull request #1549 from pi-hole/dependabot/pip/test/dev/pytest-8.0.2 yubiuser 2024-03-02 12:50:57 +0100
  • 02c93b362c
    Bump pytest from 8.0.0 to 8.0.2 in /test dependabot[bot] 2024-03-02 10:11:52 +0000
  • ee53b89aba
    fix readme quickstart guide Diogo Samuel Fernandes 2024-03-01 19:39:27 +0000
  • e3f158318c
    Merge pull request #1545 from pi-hole/master Adam Warner 2024-02-26 22:09:51 +0000
  • f43b44823c
    Bump aiohttp from 3.9.1 to 3.9.2 in /test dependabot[bot] 2024-02-26 21:32:54 +0000
  • 91ff5662c4
    Merge pull request #1544 from pi-hole/dev 2024.03.2 2024.03.1 2024.03.0 2024.02.2 Adam Warner 2024-02-26 21:29:53 +0000
  • d366935670
    Bump pytest from 8.0.0 to 8.0.1 in /test dependabot[bot] 2024-02-17 10:57:36 +0000
  • b9676108e2
    Merge pull request #1535 from pi-hole/dependabot/pip/test/dev/pytest-8.0.0 yubiuser 2024-02-04 16:36:31 +0100
  • e2035c184f
    Bump pytest from 7.4.4 to 8.0.0 in /test dependabot[bot] 2024-02-03 11:46:12 +0000
  • 81268690c9
    Merge pull request #1534 from pi-hole/dependabot/pip/test/dev/black-24.1.1 yubiuser 2024-02-03 12:45:20 +0100
  • 9601db6be2
    Bump black from 24.1.0 to 24.1.1 in /test dependabot[bot] 2024-02-03 10:58:30 +0000
  • c79170f864
    Merge pull request #1528 from pi-hole/master Adam Warner 2024-01-27 15:40:06 +0000
  • 317fb86ba7
    Merge pull request #1532 from pi-hole/dependabot/pip/test/dev/black-24.1.0 yubiuser 2024-01-27 14:35:45 +0100
  • 119ae7331e
    Bump black from 23.12.1 to 24.1.0 in /test dependabot[bot] 2024-01-27 10:57:08 +0000
  • 2cabcc6fd1
    Merge pull request #1529 from pi-hole/builder_fontend Adam Warner 2024-01-12 19:19:07 +0000