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.
This commit is contained in:
Edward Thomson
2018-10-21 10:34:38 +01:00
parent 415a8ae9c9
commit 7c5571690a

View File

@@ -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