mirror/dnscrypt-server-docker
1
1
Fork 0
mirror of https://github.com/dnscrypt/dnscrypt-server-docker synced 2024-11-22 23:51:59 +01:00
Code Issues

Merge branch 'master' of github.com:jedisct1/dnscrypt-server-docker

Browse Source
This commit is contained in:
Frank Denis 2019-12-16 12:27:32 +01:00
commit 53ec5cdd78
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -61,6 +61,7 @@ RUN mkdir -p \
/etc/service/watchdog /etc/service/watchdog
COPY encrypted-dns.toml.in /opt/encrypted-dns/etc/ COPY encrypted-dns.toml.in /opt/encrypted-dns/etc/
COPY undelegated.txt /opt/encrypted-dns/etc/
COPY entrypoint.sh / COPY entrypoint.sh /

21
README.md
View File

@ -119,7 +119,7 @@ docker pull jedisct1/dnscrypt-server
ls -l /etc/dnscrypt-server/keys ls -l /etc/dnscrypt-server/keys
``` ```
If you have some content here, skip to step 2. If you have some content here, skip to step 3.
Nothing here? Maybe you didn't use the `-v` option to map container files to a local directory when creating the container. Nothing here? Maybe you didn't use the `-v` option to map container files to a local directory when creating the container.
In that case, copy the data directly from the container: In that case, copy the data directly from the container:
@ -128,14 +128,20 @@ In that case, copy the data directly from the container:
docker cp dnscrypt-server:/opt/encrypted-dns/etc/keys ~/keys docker cp dnscrypt-server:/opt/encrypted-dns/etc/keys ~/keys
``` ```
3. Stop the container: 3. Stop the existing container:
```sh ```sh
docker stop dnscrypt-server docker stop dnscrypt-server
docker ps # Check that it's not running docker ps # Check that it's not running
``` ```
1. Use the `init` command again and start the new container: 4. Rename the existing container:
```sh
docker rename dnscrypt-server dnscrypt-server-old
```
5. Use the `init` command again and start the new container:
```sh ```sh
docker run --name=dnscrypt-server -p 443:443/udp -p 443:443/tcp --net=host \ docker run --name=dnscrypt-server -p 443:443/udp -p 443:443/tcp --net=host \
@ -145,9 +151,16 @@ jedisct1/dnscrypt-server init -N example.com -E '192.168.1.1:443'
# (adjust accordingly) # (adjust accordingly)
docker start dnscrypt-server docker start dnscrypt-server
docker ps # Check that it's running
``` ```
5. Done! 6. Delete old container:
```sh
docker rm dnscrypt-server-old
```
7. Done!
Parameters differ from the ones used in the previous container. Parameters differ from the ones used in the previous container.

3
encrypted-dns.sh
View File

@ -8,4 +8,7 @@ if [ ! -f "$KEYS_DIR/provider_name" ]; then
exit 1 exit 1
fi fi
chown -R _encrypted-dns:_encrypted-dns /opt/dnscrypt-wrapper/etc/keys 2>/dev/null || :
chown -R _encrypted-dns:_encrypted-dns /opt/encrypted-dns/etc/keys 2>/dev/null || :
exec /opt/encrypted-dns/sbin/encrypted-dns --config "$CONFIG_FILE" exec /opt/encrypted-dns/sbin/encrypted-dns --config "$CONFIG_FILE"

8
encrypted-dns.toml.in
View File

@ -70,7 +70,7 @@ cache_capacity = 150000
## DNS cache: minimum TTL ## DNS cache: minimum TTL
cache_ttl_min = 600 cache_ttl_min = 3600
## DNS cache: max TTL ## DNS cache: max TTL
@ -100,12 +100,12 @@ daemonize = false
## User name to drop privileges to, when started as root. ## User name to drop privileges to, when started as root.
# user = "_encrypted-dns" user = "_encrypted-dns"
## Group name to drop privileges to, when started as root. ## Group name to drop privileges to, when started as root.
# group = "_encrypted-dns" group = "_encrypted-dns"
## Path to chroot() to, when started as root. ## Path to chroot() to, when started as root.
@ -177,7 +177,7 @@ key_cache_capacity = 10000
## but will never resolve to anything. The server will immediately return a ## but will never resolve to anything. The server will immediately return a
## synthesized NXDOMAIN response instead of hitting root servers. ## synthesized NXDOMAIN response instead of hitting root servers.
# undelegated_list = "/etc/undelegated.txt" undelegated_list = "/opt/encrypted-dns/etc/undelegated.txt"
## Ignore A and AAAA queries for unqualified host names. ## Ignore A and AAAA queries for unqualified host names.