Commit Graph

8 Commits

Author SHA1 Message Date
Daniel 51daf5cba2
Merge branch 'master' of github.com:pi-hole/docker-pi-hole into bugfix/resolve-dev-merge-conflicts
Signed-off-by: Daniel <daniel@developerdan.com>
2020-07-16 16:26:21 -04:00
Adam Hill 1b4677b5ed pull base image
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:42:24 -05:00
Adam Hill b50e94e22d revert
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:41:12 -05:00
Adam Hill 0da5afcd61 print images in build image
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-28 08:15:01 -05:00
Adam Hill 04ab6d447f docker-compose pip is garbage to install
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:42:32 -05:00
Adam Hill caad778b0c install docker-compose;
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:10:40 -05:00
Adam Hill 4c4e9c3bc9 Beta v5.0
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-03 23:39:03 -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