Commit Graph

928 Commits

Author SHA1 Message Date
Adam Hill 8bfe96968d
Merge pull request #552 from pi-hole/deploy-images-from-ci
CircleCI, CD, Python3, and PipEnv
2020-02-03 15:37:14 -06:00
Adam Hill aab53102db Delete the unecessary
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-30 20:46:12 -06:00
Adam Hill 1265766b3a finally?
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-30 20:28:06 -06:00
Adam Hill 3765d41b5c Update way too much
- Tox py3.7 + pipenv
- Python3 Dockerfile.py
- Dockerfile.py tags remote instead of just local image names now
- Circle.sh instead of in-line circle.yml script breakout
- probably other stuff I forgot
- Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers.
- Rename aarch64 to arm64 to reduce custom map
2020-01-30 20:26:57 -06:00
Adam Hill 939d2992f1
Quiet things down
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:47:04 -06:00
Adam Hill a92ea9c386
correct todo comment
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:41:11 -06:00
Adam Hill d880f69836
Remove manfiest for now, fix namespace
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:39:57 -06:00
Adam Hill ea989a78c4
Preparing code for master/tags/latest image
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:21:36 -06:00
Adam Hill a615d551a5
remove tox re-running in deploy script
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:11:09 -06:00
Adam Hill 6995122edd
remove dryrun
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-13 23:52:40 -06:00
Adam Hill ad6c06d075
image and namespace are now defaulted but overridable
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-13 23:47:40 -06:00
Adam Hill fe3c9d22d5
forget why sudo is needed...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-04 12:24:26 -06:00
Adam Hill 7d54465eb0
Remove branch, leaving just tags for wf builds to fix?
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-04 12:03:49 -06:00
Adam Hill 1505156bfa
fix?
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-03 00:01:35 -06:00
Adam Hill 6ddcd3f716
fix?
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:58:14 -06:00
Adam Hill 2f2fb40c56
fix?
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:50:56 -06:00
Adam Hill c3933ab7ae
missing filter key
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:45:50 -06:00
Adam Hill 5c1503aff5
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into deploy-images-from-ci
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:42:14 -06:00
Adam Hill f34f2ce857
CircleCI deployment take 1
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:42:04 -06:00
Adam Hill 8d5724e70e
Merge pull request #532 from cwilby/patch-1
Fix indenting in docker-compose.yml
2020-01-02 13:45:02 -06:00
Adam Hill 23c4420630
Merge pull request #524 from billimek/add_dns_fqdn_required
Add new optional env variable DNS_FQDN_REQUIRED
2020-01-02 13:38:30 -06:00
Adam Hill 09eae003cf
Merge pull request #551 from pi-hole/armel
Armel
2020-01-02 13:37:47 -06:00
Adam Hill 4ba50052a5
re-enable arm 2020-01-01 21:33:38 -06:00
Adam Hill 9c5393dfa0
Merge branch 'dev' of github.com:diginc/docker-pi-hole into armel
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-01 21:25:53 -06:00
Adam Hill 9c76d246f6
Merge pull request #550 from pi-hole/circleci
Circle CI replacing Travis
2020-01-01 21:25:09 -06:00
Adam Hill 096c6b5848
added armel with manual patch for now
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:42:26 -06:00
Adam Hill 8b51f53bfe
remove armel for now
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:41:31 -06:00
Adam Hill 8ab895b38a
bump some versions, remove unused
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 18:02:22 -06:00
Adam Hill 3a0b1b197c
upgrade pip
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 17:48:09 -06:00
Adam Hill 3d8fed70e7
updated pip freeze
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 17:45:35 -06:00
Adam Hill c2bca952a4
forgot requirements.txt
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 17:42:08 -06:00
Adam Hill 0c5468ba29
more command fixes
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 16:57:37 -06:00
Adam Hill 18b1f446ab
command typo
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 16:56:08 -06:00
Adam Hill f23ef9b293
switching to circleci
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 16:53:50 -06:00
Warren Fisher e92dfcfa38 Revert "Update pytest for travisCI"
This reverts commit fcbe538aa932f7070b655b6ae901670a4216bdef.

Signed-off-by: Warren Fisher <github@warrenfisher.dev>
2019-11-17 16:33:30 -04:00
Warren Fisher c88f12a351 Update pytest for travisCI
Signed-off-by: Warren Fisher <github@warrenfisher.dev>
2019-11-17 16:33:30 -04:00
Warren Fisher 6e38238dc1 Add to Ubuntu install section
Add info about restarting systemd-resolved

Signed-off-by: Warren Fisher <github@warrenfisher.dev>

Add to Ubuntu install section

Signed-off-by: Warren Fisher <github@warrenfisher.dev>
2019-11-17 16:33:30 -04:00
Cameron Wilby e74f8c12e4
Update docker-compose.yml 2019-11-12 16:58:04 -08:00
Jeff Billimek 4dffbf031c Add new optional env variable DNS_FQDN_REQUIRED
This new optional env variable will allow control over the 'Never
forward non-FQDNs' advanced DNS setting.

Signed-off-by: Jeff Billimek <jeff@billimek.com>
2019-10-16 00:29:40 -04:00
Mitchel Humpherys b5356568d5 docker_run.sh: Add env var to specify storage directory
Currently `docker_run.sh` bind-mounts some directories rooted at the
working directory when the script is invoked.  Add an environment variable
so that this storage location can be specified at invocation time without
having to change to a different directory.

Also creates PIHOLE_BASE if it doesn't exist already.
2019-09-30 11:44:40 -07:00
Adam Hill 49ed8a0b2c
Merge pull request #513 from pi-hole/v4.3.2-web
v4.3.2 web
2019-09-22 15:03:29 -05:00
Adam Hill 05977b507d
Update install.sh 2019-09-22 13:48:36 -05:00
Adam Hill 7a41d55e61
Merge pull request #504 from kaysond/master
Update README.md to include detailed Ubuntu install tips
2019-09-20 21:47:13 -05:00
kaysond e7174adaf1 Update README.md to include detailed Ubuntu install tips
Signed-off-by: kaysond <kaysond@hotmail.com>
2019-09-20 18:33:02 -07:00
Adam Hill f38ac6ff0b
Merge pull request #511 from pi-hole/dev
v4.3.2 + Dev changes
2019-09-19 23:55:05 -05:00
Adam Hill 17f87be607
wait for returncode
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-19 00:07:56 -05:00
Adam Hill 658df9e905
comment cleanup
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-17 23:14:12 -05:00
Adam Hill aa31e6baf6
Dockerfile.py now live prints docker build output
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-17 23:06:31 -05:00
Adam Hill a6e70b653d
Upgrade 2019-09-17 22:13:12 -05:00
Adam Hill e061deee3e
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2019-09-15 20:23:47 -05:00