diff --git a/azure-pipelines.web.yaml b/azure-pipelines.web.yaml index bfa45ad9a..a65b38ce4 100644 --- a/azure-pipelines.web.yaml +++ b/azure-pipelines.web.yaml @@ -31,7 +31,7 @@ steps: - task: Docker@2 displayName: "build" inputs: - containerRegistry: "collinbarrett-github-packages" + containerRegistry: "github-package-registry" repository: "collinbarrett/filterlists/filterlists.web" command: "build" Dockerfile: "web/Dockerfile" @@ -41,10 +41,16 @@ steps: $(Build.BuildId) addPipelineData: false + - task: Docker@2 + displayName: "login to GPR" + inputs: + command: "login" + containerRegistry: "github-package-registry" + - task: Docker@2 displayName: "push" inputs: - containerRegistry: "collinbarrett-github-packages" + containerRegistry: "github-package-registry" repository: "collinbarrett/filterlists/filterlists.web" command: "push" tags: | @@ -52,6 +58,12 @@ steps: $(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" + - task: CopyFiles@2 displayName: "stage docker-compose files" inputs: diff --git a/docker-compose.yml b/docker-compose.yml index 7bf3420c2..07f4c9d0a 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: collinbarrett/filterlists.web:latest + image: docker.pkg.github.com/collinbarrett/filterlists/filterlists.web:latest restart: always build: context: ./web