Skip to content

Commit 504d98b

Browse files
committed
Properly handle return code after stripping libs
1 parent 2641449 commit 504d98b

8 files changed

Lines changed: 11 additions & 7 deletions

File tree

Dockerfiles/mods/Dockerfile-5.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ RUN set -x \
234234
${RUN_DEPS} \
235235
&& rm -rf /var/lib/apt/lists/* \
236236
&& update-ca-certificates \
237-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
237+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
238238

239239

240240
###

Dockerfiles/mods/Dockerfile-5.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ RUN set -x \
236236
${RUN_DEPS} \
237237
&& rm -rf /var/lib/apt/lists/* \
238238
&& update-ca-certificates \
239-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
239+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
240240

241241

242242
###

Dockerfiles/mods/Dockerfile-5.6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ RUN set -x \
238238
${RUN_DEPS} \
239239
&& rm -rf /var/lib/apt/lists/* \
240240
&& update-ca-certificates \
241-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
241+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
242242

243243

244244
###

Dockerfiles/mods/Dockerfile-7.0

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ENV BUILD_DEPS \
4040
libib-util \
4141
firebird-dev \
4242
libicu-dev \
43+
bison \
4344
libldap2-dev \
4445
libsasl2-dev \
4546
libmcrypt-dev \
@@ -244,7 +245,7 @@ RUN set -x \
244245
${RUN_DEPS} \
245246
&& rm -rf /var/lib/apt/lists/* \
246247
&& update-ca-certificates \
247-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
248+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
248249

249250

250251
###

Dockerfiles/mods/Dockerfile-7.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ RUN set -x \
244244
${RUN_DEPS} \
245245
&& rm -rf /var/lib/apt/lists/* \
246246
&& update-ca-certificates \
247-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
247+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
248248

249249

250250
###

Dockerfiles/mods/Dockerfile-7.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ RUN set -x \
246246
${RUN_DEPS} \
247247
&& rm -rf /var/lib/apt/lists/* \
248248
&& update-ca-certificates \
249-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
249+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
250250

251251

252252
###

build/ansible/DOCKERFILES/Dockerfile-mods.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ RUN set -x \
161161
${RUN_DEPS} \
162162
&& rm -rf /var/lib/apt/lists/* \
163163
&& update-ca-certificates \
164-
&& find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true
164+
&& sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true"
165165

166166

167167
{% if debug %}

build/ansible/group_vars/all.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,9 @@ extensions_available:
601601
build_dep: [libicu-dev]
602602
run_dep: [libicu52]
603603
json:
604+
7.0:
605+
type: builtin
606+
build_dep: [bison]
604607
all:
605608
type: builtin
606609
ldap:

0 commit comments

Comments
 (0)