Add compose override

johnwatson484 · Feb 13, 2025 · e451bcd · e451bcd
1 parent 08c964e
commit e451bcd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.0
+2.1.0
diff --git 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
@@ -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))