diff --git a/azure-pipelines.web.yaml b/azure-pipelines.web.yaml index 50a7c0eeb..eb1008861 100644 --- a/azure-pipelines.web.yaml +++ b/azure-pipelines.web.yaml @@ -31,43 +31,29 @@ steps: - task: Docker@2 displayName: "build" inputs: - #containerRegistry: "github-package-registry" - #repository: "collinbarrett/filterlists/filterlists.web" + containerRegistry: "collinbarrett2-dockerhub" + repository: "collinbarrett2/filterlists.web" command: "build" Dockerfile: "web/Dockerfile" buildContext: "./web" - #tags: | - # latest - # $(Build.BuildId) + tags: | + latest + $(Build.BuildId) addPipelineData: false - - task: Docker@2 - displayName: "login to GPR" - inputs: - command: "login" - containerRegistry: "github-package-registry" - condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))" - - task: Docker@2 displayName: "push" inputs: - containerRegistry: "github-package-registry" - repository: "collinbarrett/filterlists/filterlists.web" + containerRegistry: "collinbarrett2-dockerhub" + repository: "collinbarrett2/filterlists.web" command: "push" tags: | latest $(Build.BuildId) condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))" - - task: Docker@2 - displayName: "logout of GPR" - inputs: - command: logout - containerRegistry: "github-package-registry" - condition: "eq(variables['Build.SourceBranch'], 'refs/heads/master')" - - task: CopyFiles@2 - displayName: "stage compose files" + displayName: "stage docker-compose files" inputs: SourceFolder: "$(Build.SourcesDirectory)" Contents: | @@ -79,7 +65,7 @@ steps: condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))" - task: PublishBuildArtifacts@1 - displayName: "publish compose files" + displayName: "publish docker-compose files" inputs: PathtoPublish: "$(Build.ArtifactStagingDirectory)" ArtifactName: "drop" diff --git a/docker-compose.yml b/docker-compose.yml index 07f4c9d0a..35c6f1954 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: ./web