Replacing uname with dpkg

diff --git a/Dockerfile-auth b/Dockerfile-auth
index c5fa4a386b37648b88edef6e9894e20e8f228fc1..fedab975c2dfd4c3a362c2ff5c4eb2c3b7dabe94 100644 (file)
--- 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 ed636e45c19b965f96d562f7a60f8e53ceab330d..521bc173dbd931de3a80001492c97988f55e4a07 100644 (file)
--- 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 ef8a56358f1532a88673b36b07ab7d92adcfa1a2..beee2fd9efe20a5d9bcf64a1b14f8b6d9b8d9477 100644 (file)
--- 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 \