1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-02 14:11:01 +02:00
Commit Graph

46 Commits

Author SHA1 Message Date
Adam Warner
cbe61e0b44
Use dorny/paths-filter instead of the built-in path exclude. This allows us to skip "required" jobs set in branch protection rules 2022-08-01 18:37:17 +01:00
Adam Warner
0f3f8fb571
Don't run full test and build for changes to the README file (in theory!) 2022-08-01 08:00:55 +01:00
Adam Warner
e7e9004ac2
Merge branch 'dev' into massive-refactor 2022-07-15 18:04:14 +01:00
Adam Warner
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
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
Adam Warner
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
Adam Warner
c7d1fe5e82
Merge pull request #1088 from pi-hole/dependabot/github_actions/docker/build-push-action-3
Bump docker/build-push-action from 2 to 3
2022-05-23 17:11:09 +01:00
Adam Warner
bd3a69e056
Merge pull request #1089 from pi-hole/dependabot/github_actions/docker/metadata-action-4
Bump docker/metadata-action from 3 to 4
2022-05-23 17:10:58 +01:00
Adam Warner
6d894a3f34
Merge pull request #1090 from pi-hole/dependabot/github_actions/docker/setup-buildx-action-2
Bump docker/setup-buildx-action from 1 to 2
2022-05-23 17:10:15 +01:00
Adam Warner
f246384bb3
Merge pull request #1091 from pi-hole/dependabot/github_actions/docker/login-action-2
Bump docker/login-action from 1 to 2
2022-05-23 17:09:26 +01:00
Adam Warner
62c1fee49a
Merge pull request #1092 from pi-hole/dependabot/github_actions/docker/setup-qemu-action-2
Bump docker/setup-qemu-action from 1 to 2
2022-05-23 17:08:55 +01:00
dependabot[bot]
725711c9aa
Bump docker/setup-qemu-action from 1 to 2
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 06:14:49 +00:00
dependabot[bot]
820c4818e9
Bump docker/login-action from 1 to 2
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 06:14:46 +00:00
dependabot[bot]
287c45a624
Bump docker/setup-buildx-action from 1 to 2
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 06:14:43 +00:00
dependabot[bot]
ab6bdd7e77
Bump docker/metadata-action from 3 to 4
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 06:14:40 +00:00
dependabot[bot]
f7c4053179
Bump docker/build-push-action from 2 to 3
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v3)

---
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>
2022-05-09 06:14:38 +00:00
Daniel
08627a1ba7
Update everything to use bullseye as the default debian version 2022-05-02 22:36:59 -04:00
dependabot[bot]
4fa8bbe04c
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-04 20:46:18 +00:00
Adam Warner
90f4ebe882
revert base image to buster, we can try bullseye again later
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-02-12 22:48:58 +00:00
Adam Warner
0018e46a28
Bullseye anyone?
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-08 12:55:54 +00:00
Adam Warner
3f97e6e4fc
Only use branch ref for tag if we're not building via schedule event (namely, don;t also tag "master" when doing nightly)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-12-25 13:38:10 +00:00
Adam Warner
523762e47d
scream test: removing linux/ppc64le as there are build errors - unsure if anyone is _actually_ using this in any case. I guess we'll find out...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-12-11 00:21:51 +00:00
Adam Warner
9a9ee41a45
- Replace PIHOLE_VERSION with PIHOLE_DOCKER_TAG
- reorder some stuff in the main Dockerfile
- Remove the CORE/WEB/FTL_VERSION args/env vars
- tweaks to GHA build script after some hints from @crazy-max
- always checkout dev versions of Pi-hole for nightly build, also make sure we're using dev branch of this repo
- keep pihole checkout enabled for dev and nightly tags

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-12-10 20:51:35 +00:00
Adam Warner
27bdf81665
Combine nightly and main workflows into one. Tested functionality on a fork so this can come straight into dev
use dev images for the dev branch build.
Only disable pihole checkout on released tags - allow it in dev and nightly tags

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-11-17 23:42:49 +00:00
Fernando Fernández
e874dc1f3e
Publish images to GHCR alongside DockerHub (#940)
Signed-off-by: Fernando Fernández <ferferga@hotmail.com>
2021-10-31 14:39:56 +00:00
Dan Schaper
aefeb2bc8d
Use hub namepace in all actions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 14:15:30 -07:00
Dan Schaper
4782f15123
Add DOCKERHUB_NAMESPACE variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 13:41:31 -07:00
Dan Schaper
73a335533b
Use the namespace from secrets so others can build too.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 10:00:00 -07:00
Adam Warner
c371768800
And ppc64le - It might work, it might not. Someone will tell us if it doesn't.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-15 18:32:38 +01:00
Adam Warner
bc545b6049
Add linux/arm/v6 to platforms:
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-15 18:28:09 +01:00
Adam Warner
3942d9a740
Repalce PIHOLE_TAG with PIHOLE_VERSION, it isn't actually needed after all.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 23:43:59 +01:00
Adam Warner
944bc8eb79
use metadata-action to handle image tag names
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 23:27:06 +01:00
Adam Warner
55a682a94c
Use the correct namespace to upload the images...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 22:53:38 +01:00
Adam Warner
7624fc3d56
Reduce Test step to only one arch (amd64/buster)
Migrate build and push step to native github actions using docker buildX - which should _hopefully_ resolve #735
Make some adjustments to Dockerfile/build.yml/install.sh to allow both gh-actions-test.sh to build using the test suite, and github actions native commands to build online

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 22:34:24 +01:00
Adam Warner
521bed1c4f
No need to build stretch images as well as buster
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 17:03:13 +01:00
Adam Warner
1a7bfdc2ee
[skip ci] remove tag trigger, add release trigger
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 23:30:26 +01:00
Adam Warner
d84851c7a3
[skip ci] wildcard tags filter?
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 23:05:54 +01:00
Adam Warner
52b21c6ef6
remove a bunch of filters for the branch builds. No sense in building master, and the other patterns are rarely actually used.
Remove the v* filter from tag to support proposed new tag versioning format (no v up the front end)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 18:58:46 +01:00
Adam Warner
0954c9f3dd
[skip ci] remove buster from builds for now - they are not currently functional.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-05-12 20:23:51 +01:00
static-void-main
6292fd1294 Add i386 arch
Signed-off-by: static-void-main <33235498+static-void-main@users.noreply.github.com>
2021-04-15 00:15:31 +02:00
Daniel
26aea62e22
Added new Debian version: bullseye (#828)
Signed-off-by: Daniel <daniel@developerdan.com>
2021-04-13 18:09:31 +01:00
Adam Hill
daa3c1e45c
releases tags with ^v 2020-08-09 21:39:57 -05:00
Adam Hill
d96a7fe887 return to original to double check if it build branch pushes separately from PRs or not
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-17 21:41:57 -05:00
Adam Hill
28bec77984 fix repo name
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-17 20:51:19 -05:00
Adam Hill
9c791f099f Allow internal PRs to push
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-17 20:35:55 -05:00
Daniel
752d83aeaa
Introduce additional docker tags for the debian version.
* Added new docker tag variations to specify the debian version ('stretch', and 'buster').
* Arch images are alway as specific as possible: pihole/pihole:master-amd64-stretch
* Multiarch images have both the specific debian version tags as well as the generic non-debian tags: pihole/pihole:master-stretch & pihole/pihole:master
* Currently, the non-specific tags point to the 'stretch' images. Eventaully it can be migrated to 'buster'.
* Use GitHub actions to do the builds. Although the script names include 'gh-actions' to differentiate them from the 'circle' scripts, there is zero logic that is specific to Github (ie. no Github environment variables).
* 'armhf:buster' & 'arm64:buster' has an issue with `ip route get`. I think the issue is related to 'qemu', but I'm not sure. Update the `validate_env` function to only use `ip route get` if `nc` reports something strange.

Signed-off-by: Daniel <daniel@developerdan.com>
2020-06-29 09:34:19 -04:00