Merge conflict Fedora Dockerfile for tests pinned to 30

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
pull/2873/head^2
bcambl 5 years ago committed by Dan Schaper
parent d3d45a8776
commit d793ef1ab8
No known key found for this signature in database
GPG Key ID: B4FF14C01CC08DC0

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

Loading…
Cancel
Save