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

Ubuntu 21.04 changed /etc/service to /etc/runit/runsvdir/svmanaged

Browse Source
This commit is contained in:
Frank Denis 2021-04-22 20:04:59 +02:00
parent ca2efdc731
commit 22808f0601
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:20.10 FROM ubuntu:21.04
LABEL maintainer="Frank Denis" LABEL maintainer="Frank Denis"
SHELL ["/bin/sh", "-x", "-c"] SHELL ["/bin/sh", "-x", "-c"]
ENV SERIAL 2 ENV SERIAL 3
ENV CFLAGS=-Ofast ENV CFLAGS=-Ofast
ENV BUILD_DEPS curl make build-essential git libevent-dev libexpat1-dev autoconf file libssl-dev byacc ENV BUILD_DEPS curl make build-essential git libevent-dev libexpat1-dev autoconf file libssl-dev byacc
@ -57,20 +57,21 @@ RUN groupadd _encrypted-dns && \
chown _encrypted-dns:_encrypted-dns /opt/dnscrypt-wrapper/etc/keys chown _encrypted-dns:_encrypted-dns /opt/dnscrypt-wrapper/etc/keys
RUN mkdir -p \ RUN mkdir -p \
/etc/service/unbound \ /var/svc/unbound \
/etc/service/watchdog /var/svc/encrypted-dns \
/var/svc/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 undelegated.txt /opt/encrypted-dns/etc/
COPY entrypoint.sh / COPY entrypoint.sh /
COPY unbound.sh /etc/service/unbound/run COPY unbound.sh /var/svc/unbound/run
COPY unbound-check.sh /etc/service/unbound/check COPY unbound-check.sh /var/svc/unbound/check
COPY encrypted-dns.sh /etc/service/encrypted-dns/run COPY encrypted-dns.sh /var/svc/encrypted-dns/run
COPY watchdog.sh /etc/service/watchdog/run COPY watchdog.sh /var/svc/watchdog/run
VOLUME ["/opt/encrypted-dns/etc/keys"] VOLUME ["/opt/encrypted-dns/etc/keys"]

6
entrypoint.sh
View File

@ -13,6 +13,7 @@ LISTS_DIR="/opt/encrypted-dns/etc/lists"
CONF_DIR="/opt/encrypted-dns/etc" CONF_DIR="/opt/encrypted-dns/etc"
CONFIG_FILE="${CONF_DIR}/encrypted-dns.toml" CONFIG_FILE="${CONF_DIR}/encrypted-dns.toml"
CONFIG_FILE_TEMPLATE="${CONF_DIR}/encrypted-dns.toml.in" CONFIG_FILE_TEMPLATE="${CONF_DIR}/encrypted-dns.toml.in"
SERVICES_DIR="/etc/runit/runsvdir/svmanaged"
init() { init() {
if [ "$(is_initialized)" = yes ]; then if [ "$(is_initialized)" = yes ]; then
@ -172,6 +173,11 @@ start() {
/opt/encrypted-dns/sbin/encrypted-dns \ /opt/encrypted-dns/sbin/encrypted-dns \
--config "$CONFIG_FILE" --dry-run | --config "$CONFIG_FILE" --dry-run |
tee "${KEYS_DIR}/provider-info.txt" tee "${KEYS_DIR}/provider-info.txt"
find /var/svc -mindepth 1 -maxdepth 1 -type d | while read -r service; do
ln -s "$service" "${SERVICES_DIR}/"
done
exec /etc/runit/2 </dev/null >/dev/null 2>/dev/null exec /etc/runit/2 </dev/null >/dev/null 2>/dev/null
} }