Skip to content

Commit 7ba03ca

Browse files
openssl 1.0.1 for 5.6.0 and docker file improvements
1 parent a8fd700 commit 7ba03ca

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ RUN chmod +x ./configure.sh && ./configure.sh ${CORE_COUNT} ${CI_BUILD}
9696

9797
RUN if [ $CI_BUILD = 2 ]; then \
9898
echo "Suppressing all make output for CI environments to decrease log size..."; \
99-
make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \
99+
make -j${CORE_COUNT} > /dev/null 2>&1 || echo "Running make again to see errors..." && make > /tmp/makelog 2>&1 || echo "displaying last N lines..." && tail -n 500 /tmp/makelog && exit 2; \
100100
elif [ $CI_BUILD ]; then \
101101
echo "Suppressing regular make output for CI environments to decrease log size..."; \
102-
make -j${CORE_COUNT} > /dev/null || echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog; \
102+
make -j${CORE_COUNT} > /dev/null || echo "Running make again to see errors..." && make > /tmp/makelog || echo "displaying last N lines..." && tail -n 500 /tmp/makelog && exit 2; \
103103
else \
104104
make -j${CORE_COUNT}; \
105105
fi;

buildconfig/configure-5.6.0.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ CORE_COUNT=$1
55
# adding compatible ssl version
66
git clone https://github.com/openssl/openssl.git
77
cd openssl
8-
git checkout OpenSSL_1_0_2-stable
9-
LATEST_TAG=$(git describe --match "OpenSSL_1_0_2[a-z]*" --abbrev=0)
8+
git checkout OpenSSL_1_0_1-stable
9+
LATEST_TAG=$(git describe --match "OpenSSL_1_0_1[a-z]*" --abbrev=0)
1010
git checkout $LATEST_TAG
1111
./config --prefix=/opt/openssl_build_stable -shared > /dev/null 2>&1 || ./config --prefix=/opt/openssl_build_stable -shared
1212
make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT

0 commit comments

Comments
 (0)