Enable arm again

images/nginx/Makefile

@@ -13,20 +13,20 @@
 # limitations under the License.
 
 # 0.0.0 shouldn't clobber any released builds
-TAG ?= 0.89
+TAG ?= 0.90
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 DOCKER ?= docker
 
-ALL_ARCH = amd64 arm64
+ALL_ARCH = amd64 arm arm64
 SED_I?=sed -i
 GOHOSTOS ?= $(shell go env GOHOSTOS)
 
 ifeq ($(GOHOSTOS),darwin)
   SED_I=sed -i ''
 endif
 
-QEMUVERSION=v3.0.0
+QEMUVERSION=v4.0.0-2
 
 IMGNAME = nginx
 IMAGE = $(REGISTRY)/$(IMGNAME)
@@ -35,6 +35,9 @@ MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 # Set default base image dynamically for each arch
 BASEIMAGE?=quay.io/kubernetes-ingress-controller/debian-base-$(ARCH):0.1
 
+ifeq ($(ARCH),arm)
+	QEMUARCH=arm
+endif
 ifeq ($(ARCH),arm64)
 	QEMUARCH=aarch64
 endif

images/nginx/rootfs/build.sh

@@ -19,6 +19,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+export DEBIAN_FRONTEND=noninteractive
+
 export OPENRESTY_VERSION=1.15.8.1
 export NGINX_DIGEST_AUTH=cd8641886c873cf543255aeda20d23e4cd603d05
 export NGINX_SUBSTITUTIONS=bc58cb11844bc42735bbaef7085ea86ace46d05b
@@ -56,7 +58,6 @@ get_src()
   rm -rf "$f"
 }
 
-
 apt-get update && apt-get dist-upgrade -y
 
 # install required packages to build
@@ -94,6 +95,13 @@ clean-install \
   nano \
   || exit 1
 
+# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1667178.html
+if [[ ${ARCH} == "armv7l" ]]; then
+  echo "Fixing ca-certificates"
+  touch /etc/ssl/certs/ca-certificates.crt
+  c_rehash
+fi
+
 mkdir -p /etc/nginx
 
 # Get the GeoIP data
@@ -173,7 +181,10 @@ export HUNTER_JOBS_NUMBER=${CORES}
 export HUNTER_KEEP_PACKAGE_SOURCES=false
 export HUNTER_USE_CACHE_SERVERS=true
 
-# Installing luarocks packages
+if [[ ${ARCH} == "armv7l" ]]; then
+  export PCRE_DIR=/usr/lib/arm-linux-gnueabihf
+fi
+
 if [[ ${ARCH} == "x86_64" ]]; then
   export PCRE_DIR=/usr/lib/x86_64-linux-gnu
 fi
@@ -218,6 +229,7 @@ make install
 
 # build jaeger lib
 cd "$BUILD_PATH/jaeger-client-cpp-$JAEGER_VERSION"
+patch < /patches/jaeger-client-cpp.patch
 sed -i 's/-Werror/-Wno-psabi/' CMakeLists.txt
 
 cat <<EOF > export.map

images/nginx/rootfs/patches/jaeger-client-cpp.patch

@@ -0,0 +1,13 @@
+--- CMakeLists.txt	2019-03-05 11:47:19.000000000 +0000
++++ CMakeLists.txt	2019-03-05 11:48:29.000000000 +0000
+@@ -12,8 +12,8 @@
+ include(CMakeDependentOption)
+ include(HunterGate)
+ HunterGate(
+-    URL "https://github.com/ruslo/hunter/archive/v0.23.5.tar.gz"
+-    SHA1 "2c5c6fc1cf609d0856695d60f147594daf4e6b3e"
++    URL "https://github.com/ruslo/hunter/archive/v0.23.194.tar.gz"
++    SHA1 "6b722085f51b039e883ecb3d233390a93ed29dac"
+ )
+
+ project(jaegertracing VERSION 0.5.0)