Merge pull request libgit2#6343 from libgit2/ethomson/ci

ci: update dockerfiles for mbedTLS new url

Author: ethomson

.github/workflows/main.yml

@@ -241,7 +241,11 @@ jobs:
       working-directory: ${{ env.docker-config-path }}
       if: matrix.platform.container.name != ''
     - name: Create container
-      run: docker build -t ${{ env.docker-registry-container-sha }} -f ${{ env.dockerfile }} .
+      run: |
+        if [ "${{ matrix.container.base }}" != "" ]; then
+          BASE_ARG="--build-arg BASE=${{ matrix.container.base }}"
+        fi
+        docker build -t ${{ env.docker-registry-container-sha }} --build-arg UID=$(id -u) --build-arg GID=$(id -g) ${BASE_ARG} -f ${{ env.dockerfile }} .
       working-directory: ${{ env.docker-config-path }}
       if: matrix.platform.container.name != '' && env.docker-container-exists != 'true'
     - name: Build and test

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=""

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 && \

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 && \