jarvis/homeassistant-addon-dnclient
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multi-stage build: extract dnclient binary to avoid VOLUME, symlink /etc/defined -> /data/defined

Browse source
This commit is contained in:
Jarvis 2026-02-19 07:36:07 +00:00
parent 5495aec1f4
commit ad62d56915
2 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dnclient/Dockerfile
View file

@ -1,6 +1,12 @@
ARG BUILD_FROM=definednet/dnclient:latest ARG BUILD_FROM=definednet/dnclient:latest
FROM ${BUILD_FROM}
# Extract dnclient binary from official image (avoids inheriting its VOLUME)
FROM ${BUILD_FROM} AS source
FROM alpine:3.21
RUN apk add --no-cache iptables ip6tables ca-certificates
COPY --from=source /usr/bin/dnclient /usr/bin/dnclient
COPY run.sh / COPY run.sh /
RUN chmod a+x /run.sh RUN chmod a+x /run.sh

24
dnclient/run.sh
View file

@ -2,35 +2,19 @@
set -e set -e
PERSIST_DIR="/data/defined" PERSIST_DIR="/data/defined"
SYSTEM_DIR="/etc/defined"
# Ensure persistent directory exists # Ensure persistent directory exists and symlink /etc/defined to it
mkdir -p "${PERSIST_DIR}" mkdir -p "${PERSIST_DIR}"
ln -sfn "${PERSIST_DIR}" /etc/defined
# Restore persisted config if it exists
if [ -f "${PERSIST_DIR}/config.yml" ]; then
cp -a "${PERSIST_DIR}/." "${SYSTEM_DIR}/"
echo "Restored persisted dnclient config."
fi
# Read enrollment code from HA options # Read enrollment code from HA options
ENROLLMENT_CODE="$(cat /data/options.json | sed -n 's/.*"enrollment_code" *: *"\([^"]*\)".*/\1/p')" ENROLLMENT_CODE="$(cat /data/options.json | sed -n 's/.*"enrollment_code" *: *"\([^"]*\)".*/\1/p')"
# Only set enrollment code if non-empty and host is not already enrolled # Only set enrollment code if non-empty and host is not already enrolled
if [ -n "${ENROLLMENT_CODE}" ] && [ ! -f "${SYSTEM_DIR}/config.yml" ]; then if [ -n "${ENROLLMENT_CODE}" ] && [ ! -f "${PERSIST_DIR}/config.yml" ]; then
export DN_ENROLLMENT_CODE="${ENROLLMENT_CODE}" export DN_ENROLLMENT_CODE="${ENROLLMENT_CODE}"
echo "Enrolling host with provided enrollment code..." echo "Enrolling host with provided enrollment code..."
fi fi
# Persist config on shutdown
trap 'echo "Persisting config..."; cp -a "${SYSTEM_DIR}/." "${PERSIST_DIR}/"; exit 0' TERM INT
echo "Starting dnclient..." echo "Starting dnclient..."
dnclient & exec dnclient
DNCLIENT_PID=$!
# Wait a moment for enrollment to complete, then persist
sleep 5
cp -a "${SYSTEM_DIR}/." "${PERSIST_DIR}/" 2>/dev/null || true
wait ${DNCLIENT_PID}