From: James-Crowley <James.Crowley@ibm.com>
Date: Wed, 10 Feb 2021 15:40:20 +0000 (-0500)
Subject: Replacing uname with dpkg
X-Git-Tag: dnsdist-1.6.0-alpha2~25^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10067%2Fhead;p=thirdparty%2Fpdns.git

Replacing uname with dpkg
---

diff --git a/Dockerfile-auth b/Dockerfile-auth
index c5fa4a386b..fedab975c2 100644
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -1,7 +1,7 @@
 # our chosen base image
 FROM debian:10-slim AS builder
 
-ENV NO_LUA_JIT="s390x aarch64"
+ENV NO_LUA_JIT="s390x arm64"
 
 # TODO: make sure /source looks roughly the same from git or tar
 
@@ -45,7 +45,7 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
 
 # simplify repeated -C calls with SUBDIRS?
 RUN mkdir /build && \
-    LUAVER=$([ -z "${NO_LUA_JIT##*$(uname -m)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
     ./configure \
       --with-lua=${LUAVER} \
       --sysconfdir=/etc/powerdns \
diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index ed636e45c1..521bc173db 100644
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -1,7 +1,7 @@
 # our chosen base image
 FROM debian:10-slim AS builder
 
-ENV NO_LUA_JIT="s390x aarch64"
+ENV NO_LUA_JIT="s390x arm64"
 
 # TODO: make sure /source looks roughly the same from git or tar
 
@@ -41,7 +41,7 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     BUILDER_MODULES=dnsdist autoreconf -vfi
 
 RUN mkdir /build && \
-    LUAVER=$([ -z "${NO_LUA_JIT##*$(uname -m)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
     ./configure \
       --with-lua=${LUAVER} \
       LDFLAGS=-rdynamic \
diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index ef8a56358f..beee2fd9ef 100644
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -7,7 +7,7 @@
 # Builder
 FROM debian:10-slim AS builder
 
-ENV NO_LUA_JIT="s390x aarch64"
+ENV NO_LUA_JIT="s390x arm64"
 
 # Reusable layer for base update
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
@@ -49,7 +49,7 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     BUILDER_MODULES=recursor autoreconf -vfi
 
 RUN mkdir /build && \
-    LUAVER=$([ -z "${NO_LUA_JIT##*$(uname -m)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    LUAVER=$([ -z "${NO_LUA_JIT##*$(dpkg --print-architecture)*}" ] && echo 'lua5.3' || echo 'luajit') && \
     ./configure \
       --with-lua=${LUAVER} \
       LDFLAGS=-rdynamic \