revert API to dockerhub

.github/README.md

@@ -10,19 +10,19 @@
 <p align="center">FilterLists is the independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.</p>
 
 <p align="center"><b>Website:</b> <a href="https://filterlists.com/"><img src="https://img.shields.io/website-up-down-green-red/http/shields.io.svg" alt="Website" /></a>
-<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=12"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/12.svg" alt="Azure DevOps builds" /></a>
+<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=18"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/12.svg" alt="Azure DevOps builds" /></a>
 <a href="https://dev.azure.com/collinbarrett/FilterLists/_release?definitionId=4"><img src="https://img.shields.io/azure-devops/release/collinbarrett/b06a3d5c-459e-4789-9735-0f5969006fe8/4/5.svg" alt="Azure DevOps releases" /></a>
 <a href="https://hub.docker.com/r/collinbarrett2/filterlists.web"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.web.svg" alt="Docker Pulls" /></a>
 <br/>A React & TypeScript UI built with <a href="https://ant.design/">Ant Design</a>.</p>
 
 <p align="center"><b>API:</b> <a href="https://filterlists.com/api/v1/lists"><img src="https://img.shields.io/website-up-down-green-red/http/shields.io.svg?label=API" alt="API" /></a>
-<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=3"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/3.svg" alt="Azure DevOps builds" /></a>
-<a href="https://dev.azure.com/collinbarrett/FilterLists/_test/analytics?definitionId=3&contextType=build"><img alt="Azure DevOps tests" src="https://img.shields.io/azure-devops/tests/collinbarrett/FilterLists/3.svg"></a>
+<a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=19"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/3.svg" alt="Azure DevOps builds" /></a>
+<a href="https://dev.azure.com/collinbarrett/FilterLists/_test/analytics?definitionId=19&contextType=build"><img alt="Azure DevOps tests" src="https://img.shields.io/azure-devops/tests/collinbarrett/FilterLists/3.svg"></a>
 <a href="https://dev.azure.com/collinbarrett/FilterLists/_release?definitionId=3"><img src="https://img.shields.io/azure-devops/release/collinbarrett/b06a3d5c-459e-4789-9735-0f5969006fe8/3/4.svg" alt="Azure DevOps releases" /></a>
 <a href="https://hub.docker.com/r/collinbarrett2/filterlists.api"><img src="https://img.shields.io/docker/pulls/collinbarrett/filterlists.api.svg" alt="Docker Pulls" /></a>
 <br/>An ASP.NET Core API CRUD-ing with a MariaDB instance via EF Core.</p>
 
-<p align="center"><b>Agent:</b> 
+<p align="center"><b>Agent:</b>
 <a href="https://dev.azure.com/collinbarrett/FilterLists/_build/latest?definitionId=17"><img src="https://img.shields.io/azure-devops/build/collinbarrett/FilterLists/17.svg" alt="Azure DevOps builds" /></a>
 <a href="https://dev.azure.com/collinbarrett/FilterLists/_test/analytics?definitionId=17&contextType=build"><img alt="Azure DevOps tests" src="https://img.shields.io/azure-devops/tests/collinbarrett/FilterLists/17.svg"></a>
 <a href="https://dev.azure.com/collinbarrett/FilterLists/_release?definitionId=6"><img src="https://img.shields.io/azure-devops/release/collinbarrett/b06a3d5c-459e-4789-9735-0f5969006fe8/6/7.svg" alt="Azure DevOps releases" /></a>

azure-pipelines.api.yaml

@@ -120,8 +120,8 @@ steps:
   - task: Docker@2
     displayName: "tag build number"
     inputs:
-      containerRegistry: "collinbarrett-github-packages"
-      repository: "collinbarrett/filterlists/filterlists.api"
+      containerRegistry: "collinbarrett2-dockerhub"
+      repository: "collinbarrett2/filterlists.api"
       command: "tag"
       arguments: "docker.pkg.github.com/collinbarrett/filterlists/filterlists.api:latest docker.pkg.github.com/collinbarrett/filterlists/filterlists.api:$(Build.BuildId)"
     condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))"
@@ -129,8 +129,8 @@ steps:
   - task: Docker@2
     displayName: "push"
     inputs:
-      containerRegistry: "collinbarrett-github-packages"
-      repository: "collinbarrett/filterlists/filterlists.api"
+      containerRegistry: "collinbarrett2-dockerhub"
+      repository: "collinbarrett2/filterlists.api"
       command: "push"
       tags: |
         latest
@@ -147,8 +147,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"

docker-compose.data.tests.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   api:
-    image: docker.pkg.github.com/collinbarrett/filterlists/filterlists.api:test-data
+    image: collinbarrett2/filterlists.api:test-data
     build:
       context: .
       dockerfile: src/FilterLists.Api/Dockerfile

docker-compose.services.tests.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   api:
-    image: docker.pkg.github.com/collinbarrett/filterlists/filterlists.api:test-services
+    image: collinbarrett2/filterlists.api:test-services
     build:
       context: .
       dockerfile: src/FilterLists.Api/Dockerfile

docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - reverse-proxy
 
   api:
-    image: docker.pkg.github.com/collinbarrett/filterlists/filterlists.api:latest
+    image: collinbarrett2/filterlists.api:latest
     restart: always
     build:
       context: .