Merge conflict Fedora Dockerfile for tests pinned to 30

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
bcambl 2019-07-06 10:57:57 -06:00 committed by Dan Schaper
parent d3d45a8776
commit d793ef1ab8
No known key found for this signature in database
GPG key ID: B4FF14C01CC08DC0

View file

@ -1,4 +1,4 @@
FROM fedora:latest FROM fedora:30
ENV GITDIR /etc/.pihole ENV GITDIR /etc/.pihole
ENV SCRIPTDIR /opt/pihole ENV SCRIPTDIR /opt/pihole