From 09dff4ff5eca0a1498f05bc5b54a434f86e928d5 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 6 Oct 2021 15:08:00 -0400 Subject: [PATCH] consolidate dns plugins, add lxml deps --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ Dockerfile.armhf | 2 ++ root/etc/cont-init.d/50-config | 5 +---- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index de166f0..07f3b79 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,8 @@ RUN \ g++ \ gcc \ libffi-dev \ + libxml2-dev \ + libxslt-dev \ openssl-dev \ python3-dev && \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3967848..d7d6b95 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,6 +18,8 @@ RUN \ g++ \ gcc \ libffi-dev \ + libxml2-dev \ + libxslt-dev \ openssl-dev \ python3-dev && \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f9e3d79..8993073 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,6 +18,8 @@ RUN \ g++ \ gcc \ libffi-dev \ + libxml2-dev \ + libxslt-dev \ openssl-dev \ python3-dev && \ echo "**** install runtime packages ****" && \ diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index cc46b41..2407b73 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -236,10 +236,7 @@ if [ "$VALIDATION" = "dns" ]; then elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}" - elif [[ "$DNSPLUGIN" =~ ^(he)$ ]]; then - if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi - PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}" - elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then + elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}" elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then