diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-07-06 13:33:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 13:33:06 -0400 |
| commit | 1a94d97e5f5668d25d677471a81dba384267a428 (patch) | |
| tree | b1705a60ad0e8df083c09d562dafb1b36c35b52b | |
| parent | a2d2769b48c4aa8c000b097a81ff1edbba9f872b (diff) | |
| parent | 5afc146a6fec077e04b755ee8b7dde2a0d30e05c (diff) | |
| download | libgit2-1a94d97e5f5668d25d677471a81dba384267a428.tar.gz | |
Merge pull request #6343 from libgit2/ethomson/ci
ci: update dockerfiles for mbedTLS new url
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | ci/docker/bionic | 8 | ||||
| -rw-r--r-- | ci/docker/focal | 6 | ||||
| -rw-r--r-- | ci/docker/xenial | 8 |
4 files changed, 16 insertions, 12 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3435556af..bcad84b8b 100644 --- a/.github/workflows/main.yml +++ b/.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 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 && \ |