mirror of
https://github.com/vimagick/dockerfiles.git
synced 2024-11-28 09:08:36 +02:00
update dns
This commit is contained in:
parent
bb843eece8
commit
24868b4a5e
@ -43,4 +43,3 @@ CMD dnscrypt-proxy --local-address=$LISTEN_ADDR \
|
|||||||
--provider-name=$PROVIDER_NAME \
|
--provider-name=$PROVIDER_NAME \
|
||||||
--provider-key=$PROVIDER_KEY \
|
--provider-key=$PROVIDER_KEY \
|
||||||
--resolver-address=$RESOLVER_ADDR
|
--resolver-address=$RESOLVER_ADDR
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Dockerfile for dnscrypt-proxy-arm
|
# Dockerfile for dnscrypt-proxy-arm
|
||||||
#
|
#
|
||||||
|
|
||||||
FROM resin/rpi-raspbian
|
FROM armhf/debian:jessie
|
||||||
MAINTAINER EasyPi Software Foundation
|
MAINTAINER EasyPi Software Foundation
|
||||||
|
|
||||||
ENV LIBSODIUM_VERSION 1.0.10
|
ENV LIBSODIUM_VERSION 1.0.10
|
||||||
@ -19,7 +19,7 @@ RUN set -xe \
|
|||||||
curl \
|
curl \
|
||||||
&& mkdir libsodium \
|
&& mkdir libsodium \
|
||||||
&& cd libsodium \
|
&& cd libsodium \
|
||||||
&& curl -sSL https://github.com/vimagick/dockerfiles/raw/master/dnscrypt/proxy/arm/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 \
|
&& curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 \
|
||||||
&& ./configure --prefix=/usr --enable-minimal \
|
&& ./configure --prefix=/usr --enable-minimal \
|
||||||
&& make install \
|
&& make install \
|
||||||
&& ldconfig \
|
&& ldconfig \
|
||||||
@ -27,7 +27,7 @@ RUN set -xe \
|
|||||||
&& rm -rf libsodium \
|
&& rm -rf libsodium \
|
||||||
&& mkdir dnscrypt-proxy \
|
&& mkdir dnscrypt-proxy \
|
||||||
&& cd dnscrypt-proxy \
|
&& cd dnscrypt-proxy \
|
||||||
&& curl -sSL https://github.com/vimagick/dockerfiles/raw/master/dnscrypt/proxy/arm/dnscrypt-proxy-$DNSCRYPT_VERSION.tar.gz | tar xz --strip 1 \
|
&& curl -sSL https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-$DNSCRYPT_VERSION.tar.gz | tar xz --strip 1 \
|
||||||
&& ./configure --prefix=/usr --with-plugins \
|
&& ./configure --prefix=/usr --with-plugins \
|
||||||
&& make install \
|
&& make install \
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
@ -43,4 +43,3 @@ CMD dnscrypt-proxy --local-address=$LISTEN_ADDR \
|
|||||||
--provider-name=$PROVIDER_NAME \
|
--provider-name=$PROVIDER_NAME \
|
||||||
--provider-key=$PROVIDER_KEY \
|
--provider-key=$PROVIDER_KEY \
|
||||||
--resolver-address=$RESOLVER_ADDR
|
--resolver-address=$RESOLVER_ADDR
|
||||||
|
|
||||||
|
Binary file not shown.
Binary file not shown.
9
openvpn/arm/data/dnsmasq.conf
Normal file
9
openvpn/arm/data/dnsmasq.conf
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
interface=wlan0
|
||||||
|
no-hosts
|
||||||
|
no-resolv
|
||||||
|
cache-size=10000
|
||||||
|
server=8.8.8.8#53
|
||||||
|
server=8.8.4.4#53
|
||||||
|
dhcp-range=192.168.31.10,192.168.31.20,1h
|
||||||
|
dhcp-option=3,192.168.31.1
|
||||||
|
dhcp-option=6,192.168.31.1
|
26
openvpn/arm/data/pi.ovpn
Normal file
26
openvpn/arm/data/pi.ovpn
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
client
|
||||||
|
nobind
|
||||||
|
dev tun
|
||||||
|
remote-cert-tls server
|
||||||
|
remote 127.0.0.1 1194 tcp
|
||||||
|
route 1.2.3.4 255.255.255.255 net_gateway
|
||||||
|
route 192.168.0.0 255.255.0.0 net_gateway
|
||||||
|
|
||||||
|
<key>
|
||||||
|
-----PRIVATE KEY-----
|
||||||
|
</key>
|
||||||
|
|
||||||
|
<cert>
|
||||||
|
-----CERTIFICATE-----
|
||||||
|
</cert>
|
||||||
|
|
||||||
|
<ca>
|
||||||
|
-----CERTIFICATE-----
|
||||||
|
</ca>
|
||||||
|
|
||||||
|
<tls-auth>
|
||||||
|
-----OpenVPN Static key V1-----
|
||||||
|
</tls-auth>
|
||||||
|
|
||||||
|
key-direction 1
|
||||||
|
redirect-gateway def1
|
@ -19,3 +19,12 @@ stunnel:
|
|||||||
extra_hosts:
|
extra_hosts:
|
||||||
- server:1.2.3.4
|
- server:1.2.3.4
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
|
dnsmasq:
|
||||||
|
image: easypi/dnsmasq-arm
|
||||||
|
volumes:
|
||||||
|
- ./data/dnsmasq.conf:/etc/dnsmasq.d/dnsmasq.conf
|
||||||
|
cap_add:
|
||||||
|
- NET_ADMIN
|
||||||
|
net: host
|
||||||
|
restart: always
|
||||||
|
Loading…
Reference in New Issue
Block a user