base: Improve openssl build for i686

Avoid bash-isms.

Also return true from the sub-shell.
This commit is contained in:
Matt McCormick 2016-11-06 10:13:08 -05:00
parent 3b6e09b520
commit b54dbfd9cf

View File

@ -8,8 +8,8 @@ WORKDIR /usr/src
RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \ RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \
tar -xzvf openssl-1.0.2j.tar.gz && \ tar -xzvf openssl-1.0.2j.tar.gz && \
cd openssl-1.0.2j && \ cd openssl-1.0.2j && \
WRAPPER=$([[ $DEFAULT_DOCKCROSS_IMAGE == "dockcross/manylinux-x86" ]] && echo "linux32") && \ WRAPPER=$( [ $DEFAULT_DOCKCROSS_IMAGE = "dockcross/manylinux-x86" ] && echo "linux32" || echo "") && \
CONFIG_FLAG=$([[ $DEFAULT_DOCKCROSS_IMAGE == "dockcross/manylinux-x86" ]] && echo "-m32") && \ CONFIG_FLAG=$( [ $DEFAULT_DOCKCROSS_IMAGE = "dockcross/manylinux-x86" ] && echo "-m32" || echo "") && \
${WRAPPER} ./config $CONFIG_FLAG && \ ${WRAPPER} ./config $CONFIG_FLAG && \
${WRAPPER} make && \ ${WRAPPER} make && \
cd .. && \ cd .. && \