From e0ec0ce54ad4642c1e516e7cfbf1f54e0b81a75a Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 4 Oct 2020 10:33:37 -0500 Subject: [PATCH] =?UTF-8?q?fix(docker-compose):=20=F0=9F=90=9B=20fix=20cop?= =?UTF-8?q?y=20files=20tasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reverse-proxy/azure-pipelines.yaml | 15 ++++++++++++--- services/Archival/azure-pipelines.api.yaml | 6 +++--- services/Directory/azure-pipelines.api.yaml | 6 +++--- services/azure-pipelines.api-docs.yaml | 6 +++--- web/azure-pipelines.yaml | 6 +++--- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/reverse-proxy/azure-pipelines.yaml b/reverse-proxy/azure-pipelines.yaml index 2e59e50b8..b11909518 100644 --- a/reverse-proxy/azure-pipelines.yaml +++ b/reverse-proxy/azure-pipelines.yaml @@ -20,19 +20,28 @@ steps: fetchDepth: 2 - task: CopyFiles@2 - displayName: stage files + displayName: stage reverse-proxy config files inputs: SourceFolder: $(Build.SourcesDirectory) Contents: | reverse-proxy/svr-includes/* reverse-proxy/conf.d/* - docker-compose/docker-compose.yml - docker-compose/docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) CleanTargetFolder: true OverWrite: true condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') + - task: CopyFiles@2 + displayName: stage docker-compose files + inputs: + SourceFolder: $(Build.SourcesDirectory)/docker-compose + Contents: | + docker-compose.yml + docker-compose.prod.yml + TargetFolder: $(Build.ArtifactStagingDirectory) + OverWrite: true + condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') + - task: PublishBuildArtifacts@1 displayName: publish files inputs: diff --git a/services/Archival/azure-pipelines.api.yaml b/services/Archival/azure-pipelines.api.yaml index 6e0c51807..53e3aaab7 100644 --- a/services/Archival/azure-pipelines.api.yaml +++ b/services/Archival/azure-pipelines.api.yaml @@ -78,10 +78,10 @@ steps: - task: CopyFiles@2 displayName: stage docker-compose files inputs: - SourceFolder: $(Build.SourcesDirectory) + SourceFolder: $(Build.SourcesDirectory)/docker-compose Contents: | - docker-compose/docker-compose.yml - docker-compose/docker-compose.prod.yml + docker-compose.yml + docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) CleanTargetFolder: true OverWrite: true diff --git a/services/Directory/azure-pipelines.api.yaml b/services/Directory/azure-pipelines.api.yaml index 549eb153e..cc5659ea9 100644 --- a/services/Directory/azure-pipelines.api.yaml +++ b/services/Directory/azure-pipelines.api.yaml @@ -80,10 +80,10 @@ steps: - task: CopyFiles@2 displayName: stage docker-compose files inputs: - SourceFolder: $(Build.SourcesDirectory) + SourceFolder: $(Build.SourcesDirectory)/docker-compose Contents: | - docker-compose/docker-compose.yml - docker-compose/docker-compose.prod.yml + docker-compose.yml + docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) CleanTargetFolder: true OverWrite: true diff --git a/services/azure-pipelines.api-docs.yaml b/services/azure-pipelines.api-docs.yaml index 8f2c8ba52..18e96a83e 100644 --- a/services/azure-pipelines.api-docs.yaml +++ b/services/azure-pipelines.api-docs.yaml @@ -21,10 +21,10 @@ steps: - task: CopyFiles@2 displayName: stage files inputs: - SourceFolder: $(Build.SourcesDirectory) + SourceFolder: $(Build.SourcesDirectory)/docker-compose Contents: | - docker-compose/docker-compose.yml - docker-compose/docker-compose.prod.yml + docker-compose.yml + docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) CleanTargetFolder: true OverWrite: true diff --git a/web/azure-pipelines.yaml b/web/azure-pipelines.yaml index fea93deb9..128cc7bd3 100644 --- a/web/azure-pipelines.yaml +++ b/web/azure-pipelines.yaml @@ -60,10 +60,10 @@ steps: - task: CopyFiles@2 displayName: stage docker-compose files inputs: - SourceFolder: $(Build.SourcesDirectory) + SourceFolder: $(Build.SourcesDirectory)/docker-compose Contents: | - docker-compose/docker-compose.yml - docker-compose/docker-compose.prod.yml + docker-compose.yml + docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) CleanTargetFolder: true OverWrite: true