From b54dbfd9cf0bd722b02e466c3761b66e2f1dde79 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Sun, 6 Nov 2016 10:13:08 -0500 Subject: [PATCH] base: Improve openssl build for i686 Avoid bash-isms. Also return true from the sub-shell. --- common.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.docker b/common.docker index 3bb565b..4aae6ed 100644 --- a/common.docker +++ b/common.docker @@ -8,8 +8,8 @@ WORKDIR /usr/src RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \ tar -xzvf openssl-1.0.2j.tar.gz && \ cd openssl-1.0.2j && \ - WRAPPER=$([[ $DEFAULT_DOCKCROSS_IMAGE == "dockcross/manylinux-x86" ]] && echo "linux32") && \ - CONFIG_FLAG=$([[ $DEFAULT_DOCKCROSS_IMAGE == "dockcross/manylinux-x86" ]] && echo "-m32") && \ + WRAPPER=$( [ $DEFAULT_DOCKCROSS_IMAGE = "dockcross/manylinux-x86" ] && echo "linux32" || echo "") && \ + CONFIG_FLAG=$( [ $DEFAULT_DOCKCROSS_IMAGE = "dockcross/manylinux-x86" ] && echo "-m32" || echo "") && \ ${WRAPPER} ./config $CONFIG_FLAG && \ ${WRAPPER} make && \ cd .. && \