From: James-Crowley <James.Crowley@ibm.com>
Date: Fri, 5 Feb 2021 22:18:36 +0000 (-0500)
Subject: Adding the lua fix for other Dockerfiles
X-Git-Tag: dnsdist-1.6.0-alpha2~25^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a8e298333833fea0054991a4fe5fc9177145b6;p=thirdparty%2Fpdns.git

Adding the lua fix for other Dockerfiles
---

diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index 3aa0aab7a5..e688bbf8fc 100644
--- 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 2b4c298199..8bd1b47eb0 100644
--- 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 && \