From 504d98b9c9cf8fad6b47b30c4d97647acb7b63ec Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 7 Apr 2018 17:18:13 +0200
Subject: [PATCH] Properly handle return code after stripping libs

---
 Dockerfiles/mods/Dockerfile-5.4              | 2 +-
 Dockerfiles/mods/Dockerfile-5.5              | 2 +-
 Dockerfiles/mods/Dockerfile-5.6              | 2 +-
 Dockerfiles/mods/Dockerfile-7.0              | 3 ++-
 Dockerfiles/mods/Dockerfile-7.1              | 2 +-
 Dockerfiles/mods/Dockerfile-7.2              | 2 +-
 build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 2 +-
 build/ansible/group_vars/all.yml             | 3 +++
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
index b5ab496..34f259d 100644
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -234,7 +234,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 ###
diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
index 613f1af..ca88761 100644
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -236,7 +236,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 ###
diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
index 20a06db..9a95f92 100644
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -238,7 +238,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 ###
diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
index fa63b3a..73e99f8 100644
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -40,6 +40,7 @@ ENV BUILD_DEPS \
 	libib-util \
 	firebird-dev \
 	libicu-dev \
+	bison \
 	libldap2-dev \
 	libsasl2-dev \
 	libmcrypt-dev \
@@ -244,7 +245,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 ###
diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
index 083f5d5..3a8f60c 100644
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -244,7 +244,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 ###
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
index 4be8132..b901b04 100644
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -246,7 +246,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 ###
diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
index 46383db..c770d7a 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
@@ -161,7 +161,7 @@ RUN set -x \
 		${RUN_DEPS} \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates \
-	&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
+	&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
 
 
 {% if debug %}
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index 253eca1..040f8ee 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -601,6 +601,9 @@ extensions_available:
       build_dep: [libicu-dev]
       run_dep: [libicu52]
   json:
+    7.0:
+      type: builtin
+      build_dep: [bison]
     all:
       type: builtin
   ldap: