diff --git a/azure-pipelines.web.yaml b/azure-pipelines.web.yaml index fbf81e0dd..bc0ce75a7 100644 --- a/azure-pipelines.web.yaml +++ b/azure-pipelines.web.yaml @@ -33,8 +33,8 @@ steps: - task: Docker@2 displayName: "build" inputs: - containerRegistry: "collinbarrett-github-packages" - repository: "collinbarrett/filterlists/filterlists.web" + containerRegistry: "collinbarrett2-dockerhub" + repository: "collinbarrett2/filterlists.web" command: "build" Dockerfile: "src/FilterLists.Web/Dockerfile" buildContext: "." @@ -46,8 +46,8 @@ steps: - task: Docker@2 displayName: "push" inputs: - containerRegistry: "collinbarrett-github-packages" - repository: "collinbarrett/filterlists/filterlists.web" + containerRegistry: "collinbarrett2-dockerhub" + repository: "collinbarrett2/filterlists.web" command: "push" tags: | latest @@ -64,8 +64,7 @@ steps: TargetFolder: "$(Build.ArtifactStagingDirectory)" CleanTargetFolder: true OverWrite: true - # condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))" - condition: "and(succeededOrFailed(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))" + condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))" - task: PublishBuildArtifacts@1 displayName: "publish docker-compose files" diff --git a/docker-compose.yml b/docker-compose.yml index af85050a7..07e6b4671 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - ./ops/nginx/svr-includes:/etc/nginx/svr-includes:ro web: - image: docker.pkg.github.com/collinbarrett/filterlists/filterlists.web:latest + image: collinbarrett2/filterlists.web:latest restart: always build: context: .