summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2022-07-06 11:45:08 -0400
committerEdward Thomson <ethomson@edwardthomson.com>2022-07-06 13:10:33 -0400
commit5afc146a6fec077e04b755ee8b7dde2a0d30e05c (patch)
treeb1705a60ad0e8df083c09d562dafb1b36c35b52b /ci
parentc70035dc09f30bc28d2c89c29a0c2c3feca501e5 (diff)
downloadlibgit2-5afc146a6fec077e04b755ee8b7dde2a0d30e05c.tar.gz
ci: update dockerfiles for mbedTLS new url
Update the new URL for mbedTLS.
Diffstat (limited to 'ci')
-rw-r--r--ci/docker/bionic8
-rw-r--r--ci/docker/focal6
-rw-r--r--ci/docker/xenial8
3 files changed, 11 insertions, 11 deletions
diff --git a/ci/docker/bionic b/ci/docker/bionic
index 52832f3d3..f1b69edef 100644
--- a/ci/docker/bionic
+++ b/ci/docker/bionic
@@ -28,14 +28,14 @@ RUN apt-get update && \
FROM apt AS mbedtls
RUN cd /tmp && \
- curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
- tar -xz && \
- cd mbedtls-2.16.2 && \
+ curl --location --silent --show-error https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-2.16.2.tar.gz | \
+ tar -xz && \
+ cd mbedtls-mbedtls-2.16.2 && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \
CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
ninja install && \
cd .. && \
- rm -rf mbedtls-2.16.2
+ rm -rf mbedtls-mbedtls-2.16.2
FROM mbedtls AS adduser
ARG UID=""
diff --git a/ci/docker/focal b/ci/docker/focal
index 8061237d7..b3a402cb0 100644
--- a/ci/docker/focal
+++ b/ci/docker/focal
@@ -32,9 +32,9 @@ RUN apt-get update && \
FROM apt AS mbedtls
RUN cd /tmp && \
- curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
+ curl --location --silent --show-error https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-2.16.2.tar.gz | \
tar -xz && \
- cd mbedtls-2.16.2 && \
+ cd mbedtls-mbedtls-2.16.2 && \
scripts/config.pl unset MBEDTLS_AESNI_C && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \
mkdir build build-msan && \
@@ -45,7 +45,7 @@ RUN cd /tmp && \
CC=clang-10 CFLAGS="-fPIC" cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DCMAKE_BUILD_TYPE=MemSanDbg -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
ninja install && \
cd .. && \
- rm -rf mbedtls-2.16.2
+ rm -rf mbedtls-mbedtls-2.16.2
FROM mbedtls AS libssh2
RUN cd /tmp && \
diff --git a/ci/docker/xenial b/ci/docker/xenial
index c9791462f..f5fa5a315 100644
--- a/ci/docker/xenial
+++ b/ci/docker/xenial
@@ -30,14 +30,14 @@ RUN apt-get update && \
FROM apt AS mbedtls
RUN cd /tmp && \
- curl --location --silent --show-error https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
- tar -xz && \
- cd mbedtls-2.16.2 && \
+ curl --location --silent --show-error https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-2.16.2.tar.gz | \
+ tar -xz && \
+ cd mbedtls-mbedtls-2.16.2 && \
scripts/config.pl set MBEDTLS_MD4_C 1 && \
CFLAGS=-fPIC cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
ninja install && \
cd .. && \
- rm -rf mbedtls-2.16.2
+ rm -rf mbedtls-mbedtls-2.16.2
FROM mbedtls AS libssh2
RUN cd /tmp && \