subvars has good packages now

pschiffe · Dec 23, 2023 · c18b7dc · c18b7dc
1 parent 4754e76
commit c18b7dc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 33 deletions.
diff --git a/pdns-admin-base-ngoduykhanh/Dockerfile b/pdns-admin-base-ngoduykhanh/Dockerfile
@@ -1,6 +1,7 @@
 FROM rockylinux/rockylinux:9-ubi
 
-RUN echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
+RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
+  && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
   && echo 'tsflags=nodocs' >> /etc/dnf/dnf.conf \
   && echo 'assumeyes=True' >> /etc/dnf/dnf.conf \
   && curl -fsSL -o /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \
@@ -19,13 +20,9 @@ RUN echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
     python3-xmlsec \
     uwsgi \
     yarn \
+    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
   && dnf clean all
 
-RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'x86_64') \
-  && curl -fsSL https://github.com/kha7iq/subvars/releases/download/v0.1.4/subvars_Linux_${arch}.tar.gz \
-    | tar -xzf - -C /usr/local/bin subvars \
-  && chmod +x /usr/local/bin/subvars
-
 RUN mkdir -p /opt/powerdns-admin \
   && curl -fsSL https://github.com/PowerDNS-Admin/PowerDNS-Admin/archive/refs/tags/v0.4.1.tar.gz \
     | tar -xzf - -C /opt/powerdns-admin --strip 1 \

diff --git a/pdns-recursor/Dockerfile b/pdns-recursor/Dockerfile
@@ -1,17 +1,15 @@
 FROM fedora:39
 
-RUN echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
+RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
+  && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
   && echo 'assumeyes=True' >> /etc/dnf/dnf.conf \
   && sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/fedora-cisco-openh264.repo \
   && dnf --refresh upgrade \
-  && dnf install pdns-recursor \
+  && dnf install \
+    pdns-recursor \
+    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
   && dnf clean all
 
-RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'x86_64') \
-  && curl -fsSL https://github.com/kha7iq/subvars/releases/download/v0.1.4/subvars_Linux_${arch}.tar.gz \
-    | tar -xzf - -C /usr/local/bin subvars \
-  && chmod +x /usr/local/bin/subvars
-
 RUN mkdir -p /etc/pdns-recursor/api.d /run/pdns-recursor \
   && chown -R pdns-recursor: /etc/pdns-recursor/api.d /run/pdns-recursor
 

diff --git a/pdns-recursor/Dockerfile.alpine b/pdns-recursor/Dockerfile.alpine
@@ -1,14 +1,12 @@
 FROM alpine:3.19.0
 
-RUN apk update \
+RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
+  && apk update \
   && apk upgrade \
   && apk add pdns-recursor \
-  && rm -rf /var/cache/apk/*
-
-RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'x86_64') \
-  && wget -qO- https://github.com/kha7iq/subvars/releases/download/v0.1.4/subvars_Linux_${arch}.tar.gz \
-    | tar -xzf - -C /usr/local/bin subvars \
-  && chmod +x /usr/local/bin/subvars
+  && wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
+  && apk add --allow-untrusted subvars.apk \
+  && rm -rf subvars.apk /var/cache/apk/*
 
 RUN mkdir -p /etc/pdns/api.d /var/run/pdns-recursor \
   && chown -R recursor: /etc/pdns/api.d /var/run/pdns-recursor

diff --git a/pdns/Dockerfile b/pdns/Dockerfile
@@ -1,21 +1,18 @@
 FROM fedora:39
 
-RUN echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
+RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
+  && echo 'install_weak_deps=False' >> /etc/dnf/dnf.conf \
   && echo 'assumeyes=True' >> /etc/dnf/dnf.conf \
   && sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/fedora-cisco-openh264.repo \
   && dnf --refresh upgrade \
   && dnf install \
     hostname \
     mariadb \
     pdns \
+    https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.rpm \
   && dnf --setopt 'tsflags=' install pdns-backend-mysql \
   && dnf clean all
 
-RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'x86_64') \
-  && curl -fsSL https://github.com/kha7iq/subvars/releases/download/v0.1.4/subvars_Linux_${arch}.tar.gz \
-    | tar -xzf - -C /usr/local/bin subvars \
-  && chmod +x /usr/local/bin/subvars
-
 COPY pdns.conf.tpl docker-entrypoint.sh /
 
 ENV VERSION=4.8 \

diff --git a/pdns/Dockerfile.alpine b/pdns/Dockerfile.alpine
@@ -1,18 +1,16 @@
 FROM alpine:3.19.0
 
-RUN apk update \
+RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'amd64') \
+  && apk update \
   && apk upgrade \
   && apk add \
     mariadb-client \
     pdns \
     pdns-backend-mysql \
     pdns-doc \
-  && rm -rf /var/cache/apk/*
-
-RUN arch=$([ "$(arch)" = 'aarch64' ] && echo -n 'arm64' || echo -n 'x86_64') \
-  && wget -qO- https://github.com/kha7iq/subvars/releases/download/v0.1.4/subvars_Linux_${arch}.tar.gz \
-    | tar -xzf - -C /usr/local/bin subvars \
-  && chmod +x /usr/local/bin/subvars
+  && wget -O subvars.apk https://github.com/kha7iq/subvars/releases/download/v0.1.5/subvars_${arch}.apk \
+  && apk add --allow-untrusted subvars.apk \
+  && rm -rf subvars.apk /var/cache/apk/*
 
 COPY pdns.conf.tpl docker-entrypoint.sh /