Adding the lua fix for other Dockerfiles

diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index 3aa0aab7a58cde1c7529c9b5d5884571ea61197e..e688bbf8fc082724e2dc5c2fc4457929776140a3 100644 (file)
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -1,6 +1,8 @@
 # our chosen base image
 FROM debian:10-slim AS builder
 
+ENV NO_LUA_JIT="s390x aarch64"
+
 # TODO: make sure /source looks roughly the same from git or tar
 
 # Reusable layer for base update
@@ -39,8 +41,8 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     BUILDER_MODULES=dnsdist autoreconf -vfi
 
 RUN mkdir /build && \
-    ./configure \
-      --with-lua=luajit \
+    /bin/bash -c ./configure \
+      --with-lua=$([[ "${NO_LUA_JIT}" == *"$(uname -m)"* ]] && echo "lua5.3" || echo "luajit") \
       LDFLAGS=-rdynamic \
       --sysconfdir=/etc/dnsdist \
       --enable-option-checking=fatal \

diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index 2b4c29819958e30936b510d035f0829b63fd85c3..8bd1b47eb0b03d5f4b37fcd2599004f55e8bbf01 100644 (file)
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -7,6 +7,8 @@
 # Builder
 FROM debian:10-slim AS builder
 
+ENV NO_LUA_JIT="s390x aarch64"
+
 # Reusable layer for base update
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 
@@ -47,8 +49,8 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     BUILDER_MODULES=recursor autoreconf -vfi
 
 RUN mkdir /build && \
-    ./configure \
-      --with-lua=luajit \
+    /bin/bash -c ./configure \
+      --with-lua=$([[ "${NO_LUA_JIT}" == *"$(uname -m)"* ]] && echo "lua5.3" || echo "luajit")  \
       LDFLAGS=-rdynamic \
       --sysconfdir=/etc/powerdns \
       --enable-option-checking=fatal && \