Commit edeec76a by Edward Thomson

ci: update all images to use libssh2 v1.11.0

parent da1e9573
...@@ -18,13 +18,13 @@ RUN yum install -y \ ...@@ -18,13 +18,13 @@ RUN yum install -y \
FROM yum AS libssh2 FROM yum AS libssh2
RUN cd /tmp && \ RUN cd /tmp && \
curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.11.0.tar.gz | tar -xz && \
cd libssh2-1.8.0 && \ cd libssh2-1.11.0 && \
./configure && \ ./configure && \
make && \ make && \
make install && \ make install && \
cd .. && \ cd .. && \
rm -rf libssh-1.8.0 rm -rf libssh-1.11.0
FROM libssh2 AS valgrind FROM libssh2 AS valgrind
RUN cd /tmp && \ RUN cd /tmp && \
......
...@@ -24,13 +24,13 @@ RUN yum install -y \ ...@@ -24,13 +24,13 @@ RUN yum install -y \
FROM yum AS libssh2 FROM yum AS libssh2
RUN cd /tmp && \ RUN cd /tmp && \
curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.0.tar.gz | tar -xz && \ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.11.0.tar.gz | tar -xz && \
cd libssh2-1.8.0 && \ cd libssh2-1.11.0 && \
./configure && \ ./configure && \
make && \ make && \
make install && \ make install && \
cd .. && \ cd .. && \
rm -rf libssh2-1.8.0 rm -rf libssh2-1.11.0
FROM libssh2 AS valgrind FROM libssh2 AS valgrind
RUN cd /tmp && \ RUN cd /tmp && \
......
...@@ -53,7 +53,7 @@ RUN cd /tmp && \ ...@@ -53,7 +53,7 @@ RUN cd /tmp && \
cd libssh2-1.9.0 && \ cd libssh2-1.9.0 && \
mkdir build build-msan && \ mkdir build build-msan && \
cd build && \ cd build && \
CC=clang-10 CFLAGS="-fPIC" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local .. && \ CC=clang-10 CFLAGS="-fPIC" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
ninja install && \ ninja install && \
cd ../build-msan && \ cd ../build-msan && \
CC=clang-10 CFLAGS="-fPIC -fsanitize=memory -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer" LDFLAGS="-fsanitize=memory" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=mbedTLS -DCMAKE_PREFIX_PATH=/usr/local/msan -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \ CC=clang-10 CFLAGS="-fPIC -fsanitize=memory -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer" LDFLAGS="-fsanitize=memory" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=mbedTLS -DCMAKE_PREFIX_PATH=/usr/local/msan -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
......
...@@ -53,12 +53,12 @@ RUN cd /tmp && \ ...@@ -53,12 +53,12 @@ RUN cd /tmp && \
FROM mbedtls AS libssh2 FROM mbedtls AS libssh2
RUN cd /tmp && \ RUN cd /tmp && \
curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.8.2.tar.gz | tar -xz && \ curl --location --silent --show-error https://www.libssh2.org/download/libssh2-1.11.0.tar.gz | tar -xz && \
cd libssh2-1.8.2 && \ cd libssh2-1.11.0 && \
CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=Libgcrypt . && \ CFLAGS=-fPIC cmake -G Ninja -DBUILD_SHARED_LIBS=ON . && \
ninja install && \ ninja install && \
cd .. && \ cd .. && \
rm -rf libssh2-1.8.2 rm -rf libssh2-1.11.0
FROM libssh2 AS valgrind FROM libssh2 AS valgrind
RUN cd /tmp && \ RUN cd /tmp && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment