From e451bcdd5f4bf280998590c328fa64dba2b73430 Mon Sep 17 00:00:00 2001 From: John Watson Date: Thu, 13 Feb 2025 20:14:34 +0000 Subject: [PATCH] Add compose override --- VERSION | 2 +- build-container-app.yaml | 6 +++--- build.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 227cea2..7ec1d6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.1.0 diff --git a/build-container-app.yaml b/build-container-app.yaml index 9d6e0b6..050c58b 100644 --- a/build-container-app.yaml +++ b/build-container-app.yaml @@ -114,12 +114,12 @@ jobs: Write-Host "##vso[task.setvariable variable=testFileExists;]$fileExists" - script: | - docker compose -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) build + docker compose -f compose.yaml -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) build displayName: Build test image condition: and(succeeded(), eq(variables.testFileExists, true)) - script: | - docker compose -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) run --rm $(repo) + docker compose -f compose.yaml -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) run --rm $(repo) displayName: Run tests condition: and(succeeded(), eq(variables.testFileExists, true)) @@ -132,7 +132,7 @@ jobs: Write-Host "##vso[task.setvariable variable=zapFileExists;]$fileExists" - script: | - docker compose -f compose.zap.yaml -p $(repo)-zap-$(Build.BuildId) run --rm $(repo)-zap + docker compose -f compose.yaml -f compose.zap.yaml -p $(repo)-zap-$(Build.BuildId) run --rm $(repo)-zap displayName: Run OWASP ZAP tests condition: and(succeeded(), eq(variables.zapFileExists, true)) diff --git a/build.yaml b/build.yaml index f8a7e36..38817ab 100644 --- a/build.yaml +++ b/build.yaml @@ -146,12 +146,12 @@ jobs: Write-Host "##vso[task.setvariable variable=testFileExists;]$fileExists" - script: | - docker compose -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) build + docker compose -f compose.yaml -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) build displayName: Build test image condition: and(succeeded(), eq(variables.testFileExists, true)) - script: | - docker compose -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) run --rm $(repo) + docker compose -f compose.yaml -f compose.test.yaml -p $(repo)-test-$(Build.BuildId) run --rm $(repo) displayName: Run tests condition: and(succeeded(), eq(variables.testFileExists, true)) @@ -164,7 +164,7 @@ jobs: Write-Host "##vso[task.setvariable variable=zapFileExists;]$fileExists" - script: | - docker compose -f compose.zap.yaml -p $(repo)-zap-$(Build.BuildId) run --rm $(repo)-zap + docker compose -f compose.yaml -f compose.zap.yaml -p $(repo)-zap-$(Build.BuildId) run --rm $(repo)-zap displayName: Run ZAP tests condition: and(succeeded(), eq(variables.zapFileExists, true))