From: James-Crowley <James.Crowley@ibm.com>
Date: Mon, 8 Feb 2021 18:38:00 +0000 (-0500)
Subject: Fixing shell command to work with sh not bash. Also setting LUAVER now
X-Git-Tag: dnsdist-1.6.0-alpha2~25^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64d4a9d9c293ff8d09d3a9a2e2c92fdf48b75f08;p=thirdparty%2Fpdns.git

Fixing shell command to work with sh not bash. Also setting LUAVER now
---

diff --git a/Dockerfile-auth b/Dockerfile-auth
index 403a83ffe6..c5fa4a386b 100644
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -45,8 +45,9 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
 
 # simplify repeated -C calls with SUBDIRS?
 RUN mkdir /build && \
-    /bin/bash -c ./configure \
-      --with-lua=$([[ "${NO_LUA_JIT}" == *"$(uname -m)"* ]] && echo "lua5.3" || echo "luajit") \
+    LUAVER=$([ -z "${NO_LUA_JIT##*$(uname -m)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    ./configure \
+      --with-lua=${LUAVER} \
       --sysconfdir=/etc/powerdns \
       --enable-option-checking=fatal \
       --with-dynmodules='bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe random remote tinydns' \
diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index e688bbf8fc..ed636e45c1 100644
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -41,8 +41,9 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     BUILDER_MODULES=dnsdist autoreconf -vfi
 
 RUN mkdir /build && \
-    /bin/bash -c ./configure \
-      --with-lua=$([[ "${NO_LUA_JIT}" == *"$(uname -m)"* ]] && echo "lua5.3" || echo "luajit") \
+    LUAVER=$([ -z "${NO_LUA_JIT##*$(uname -m)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    ./configure \
+      --with-lua=${LUAVER} \
       LDFLAGS=-rdynamic \
       --sysconfdir=/etc/dnsdist \
       --enable-option-checking=fatal \
diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index 8bd1b47eb0..ef8a56358f 100644
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -49,8 +49,9 @@ RUN if [ "${DOCKER_FAKE_RELEASE}" = "YES" ]; then \
     BUILDER_MODULES=recursor autoreconf -vfi
 
 RUN mkdir /build && \
-    /bin/bash -c ./configure \
-      --with-lua=$([[ "${NO_LUA_JIT}" == *"$(uname -m)"* ]] && echo "lua5.3" || echo "luajit")  \
+    LUAVER=$([ -z "${NO_LUA_JIT##*$(uname -m)*}" ] && echo 'lua5.3' || echo 'luajit') && \
+    ./configure \
+      --with-lua=${LUAVER} \
       LDFLAGS=-rdynamic \
       --sysconfdir=/etc/powerdns \
       --enable-option-checking=fatal && \