Merge remote-tracking branch 'origin/master' into modularization-updates

# Conflicts:
#	AdguardHome/udm-files/on_boot.sh
This commit is contained in:
John Dorman 2020-06-28 01:20:40 -07:00
commit ba40353421
3 changed files with 2 additions and 1 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/.idea/

View File

View File

@ -1,5 +1,5 @@
FROM alpine
ENV VERSION=1.6.4
ENV VERSION=1.7.0
LABEL maintainer="John Dorman <dorman@ataxia.cloud>"
RUN apk add --no-cache ca-certificates \
&& mkdir -p /opt/nextdns \