Adam Hill
9213bbd322
Merge branch 'dev' of github.com:diginc/docker-pi-hole into no_resolv_check
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-30 18:03:05 -05:00
Adam Hill
72f5730d56
have tests use - not _ in tag
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-28 08:25:49 -05:00
Adam Hill
d7fdb188ed
remove resolv conf checks
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:45:48 -05:00
Adam Hill
c024dcd8d9
Upgrade v4.3.3
...
Also remove ipv6 from tests, validation fails and breaks tests
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-23 22:33:42 -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
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
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
8ab895b38a
bump some versions, remove unused
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 18:02:22 -06:00
cclauss
6987b36981
Use print() function in both Python 2 and Python 3
...
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
2019-08-31 22:07:13 +02:00
Adam Hill
02e3ead7eb
Docker Pi-hole v4.3
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-04-11 22:17:26 -05:00
Adam Hill
f9a21d2ff9
empty the adlist for tests
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-12 22:16:15 -06:00
Adam Hill
7ecf7c6f28
Fixed tests!
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
Adam Hill
fca7769b33
remove ServerIP requirement, simpler example commands
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -06:00
Adam Hill
d3309ebb1a
remove old blocking page setup/test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 22:43:38 -06:00
Adam Hill
38d76d7ec8
fix conftest path to VERSION
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 20:37:05 -06:00
Adam Hill
440a7a19a5
v4.2 and Version pulled from a file now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-20 23:59:35 -06:00
Adam Hill
19fee6fa5e
README update for 4.1.1 and test improvement
...
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-08 21:01:42 -06:00
Adam Hill
a5211510db
Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN)
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:46:34 -06:00
Adam Hill
d0b35cec63
4.1.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -06:00
Adam Hill
b39a2ad69a
arm version complained/crashed on no TTY
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:08 -06:00
Adam Hill
d7a125a706
Version 4.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00
Adam Hill
63f2c4ea00
Fixing error with random passwords, null checking moved earlier
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-09-18 00:11:26 -05:00
Adam Hill
f8d37693ed
Fix regex writing for web, fix deploying latest
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 22:23:22 -05:00
Adam Hill
65a1ac7f1e
grab version on startup for web footer. 2 tests stablized
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:20:55 -05:00
Adam Hill
999f02b598
start of fixing race condition by not having test+s6 both run /start.sh
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:13:25 -05:00
Adam Hill
80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 13:31:58 -05:00
Adam Hill
478b98c503
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-17 19:44:34 -05:00
Adam Hill
c17cd37eca
armel build script and dockerfile stuffs
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:43:55 -05:00
diginc
ad6b4be403
Fixes to the startup, services, and dnsmasq references
2018-07-03 00:19:01 -05:00
diginc
615af98eab
delete all the alpine
2018-01-03 20:09:47 -06:00
diginc
aab0b3f3cb
fix debian test_pihole_start_cmd
2017-12-07 20:27:06 -06:00
diginc
94c90d9b91
comma
2017-11-05 21:30:32 -06:00
diginc
bcfcc85ef3
removed impossible testing combos
2017-11-05 21:30:07 -06:00
diginc
8886784b2e
fix webserver and image
2017-10-18 22:24:22 -05:00
diginc
dded3945f5
switch to dash, update persist to use new style tag
2017-10-18 22:02:23 -05:00
diginc
7c85ac8d32
Split build out from tests to ensure it runs first
2017-10-16 23:45:39 -05:00
diginc
b372f0101d
move docker image building to be a global autouse fixture to make sure it runs before tests that use output
2017-10-08 12:57:17 -05:00
diginc
d98837c828
expand most tests to run for all os arch combos
2017-10-05 11:59:19 -05:00
diginc
18997fe9f6
templated dockerfiles building used by tests
...
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
2017-10-02 22:52:02 -05:00
diginc
b9095bc123
This commit is too big, but it works
...
* Tests are passing, hopefully consistently
* FTL pulling from official releases
* thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
2017-05-13 17:03:24 -05:00
diginc
9f61b87198
debian converted to s6, aline files moved
2017-05-05 21:48:03 -05:00
diginc
20955a41fe
alpine converted to s6
2017-05-04 22:37:26 -05:00
diginc
73c054cbc5
runing as sh breaks tests, override testinfra
2017-01-17 22:48:59 -06:00
diginc
d528878bac
test passing...travis virtual environment is another story
2017-01-11 20:12:56 -06:00
diginc
9f20dcc708
disabled real adlists by default
2017-01-10 22:58:27 -06:00
diginc
6ec264e3b6
rename/clarify test and move RunningPiHole to global py.test scope
2016-11-06 13:40:24 -06:00
diginc
eddba93537
split out the bash function tests to own file
2016-10-31 23:42:08 -05:00
diginc
c9468eaabd
Pi-hole and Web versions update + new stuff
...
* New code in shell scripts required killing systemctl in images
* Added tests for the quick IPv6 env hack I made a while back
* Stopped requiring the need for update.sh to copy gravity for alpine
* (moved modifications to dockerfile)
* One step closer to unified start script for both OS versions
* Optimzed some test code
2016-10-20 22:44:44 -05:00
diginc
1e6eda27eb
Persistent dig container running dns tests
...
* Sidekick to pi-hole links and queries DNS
* Lookup the default pi.hole against what was fed in as ServerIP
* Lookup a couple outside popular static DNS servers hostnames too
* a little pre-optimized to persist the dig container since docker start adds half a second (no virtually nothing for digs)
2016-09-07 23:07:38 -05:00
diginc
30fe0a3353
Added more http endpoint tests
...
Forgot to uncomment these, revealed a flaw in the nginx config
nginx now has parity with lighttpd for pages it returns and return codes
2016-08-28 01:13:04 -05:00