From 7c5571690acef4a640f30e754bde5e133a66c33e Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sun, 21 Oct 2018 10:34:38 +0100 Subject: ci: use trusty-amd64 for openssl and mbedtls We don't need two separate docker images for OpenSSL and mbedTLS. They've been combined into a single image `trusty-amd64` that supports both. --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cec8a4765..85eb1bce0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ jobs: steps: - template: azure-pipelines/docker.yml parameters: - imageName: 'libgit2/trusty-openssl:latest' + imageName: 'libgit2/trusty-amd64:latest' environmentVariables: | CC=gcc CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL @@ -26,7 +26,7 @@ jobs: steps: - template: azure-pipelines/docker.yml parameters: - imageName: 'libgit2/trusty-mbedtls:latest' + imageName: 'libgit2/trusty-amd64:latest' environmentVariables: | CC=gcc CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS @@ -39,7 +39,7 @@ jobs: steps: - template: azure-pipelines/docker.yml parameters: - imageName: 'libgit2/trusty-openssl:latest' + imageName: 'libgit2/trusty-amd64:latest' environmentVariables: | CC=clang CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL @@ -52,7 +52,7 @@ jobs: steps: - template: azure-pipelines/docker.yml parameters: - imageName: 'libgit2/trusty-mbedtls:latest' + imageName: 'libgit2/trusty-amd64:latest' environmentVariables: | CC=clang CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -- cgit v1.2.1