From a650b6d306a4a97774f5650a54fa9e69cc4ef267 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Mon, 21 Jan 2019 08:49:41 -0600
Subject: [PATCH] change DevOps branch

---
 .travis.yml         | 38 -----------------------
 FilterLists.sln     |  1 -
 azure-pipelines.yml | 15 ++++------
 codecov.yml         |  2 +-
 docker-compose.yml  | 73 ++++++++++++++++++++++++---------------------
 5 files changed, 45 insertions(+), 84 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index e6beca8d4..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-dist: trusty
-language: csharp
-mono: none
-dotnet: 2.1.403
-solution: FilterLists.sln
-addons:
-  mariadb: '10.3'
-  apt:
-    packages:
-      - sshpass
-script:
-  - dotnet test tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  - dotnet test tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  - scripts/build.sh
-after_script:
-  - bash <(curl -s https://codecov.io/bash)
-env:
-  global:
-      #FTP_USER
-    - secure: o/C5sWQSvHAENA7OSgKyptgiI7mbBlMZOvy6cwiQDes9df32oy60CgWHhgFJ2bM61fiJt0jsvogrTY1Rk8HEYphHsJ/WzuOqbnPFJZ9V74HaGf9SN7O+8GjOrPd1p+v3Kv2q0Py3FdGeKWEbWn352Js2VRNw6uvlxxihNxETnTak2QymQ5SQpcd//O7E5NDTAO7/+mn9Le5ZN6ZE6mDf53YGVcaiN/sAbh9QOE17LX9fp5F0veuQ3a/wWjZlDLZBUwZAAxSPGqefv2eOx5wIpbbBhkFEqpN4xmhUrYNfzsGDMthhiaLAWS0JfnhSsc1l4T6b/ljoNarY2BSEYPwG4utdCauI1jdh8kR/ZZoLG7/8TJ396iIWlXW3Z0C4kHhD3075F6tqr3LbRQR5OU85+uAqwBhutwQkLLJ+Usp0pu8wj89mMYxC4Cp66aLJSdMqeemR6UIUNojNlqI1+wsclsgRgCK0KIf4LNcdmPh4WkURbzZ1SNTkmyb85bVCnP0heF6HPIguZ2aUYCWKfGuOv5ohFfv+IDPaYdQybZSPrEsROKyapgnJqvIc03UgIcAgb7GhZG4ZxAtuRNqzwg9PU0aL9vWXN6qbLm2oM5Fj0cIrab3leVpSHvJBvfxS0Wl18GhRDP7Bzmf1crkxwJqXZw1YFEK7BSuLJ7VTWo7mQUY=
-      #FTP_PASSWORD
-    - secure: JW9ZqU7dgvWSEZBAQ7ZG3/f1xt79RdR3p1wTLAlmGia8eOPCcmLd9sSder6dw08YvM6QaMTkNfoVWX2tl6ppZ5pRnYlv9bzdj1PDz9Twe9+acGJ13u97siTF9hRNI6KnUrJDZfkKDO3Kdeg0pI/5vib2gglhyVfiBYgcOAjHEHLp53fbet/hvx3gPMzunjRXFEoM6VdqBspqCSKHWF4nziVaapRGhFCq2sFL1RFz3whDGGY/7BRl2cchY11ysAyRsw+fNriwU0Hf7NTXdWFxvnsl1/pLcPnzECRjb48jgWctWwoOqm7aD5eAPCJgUEElMZc34HckinnvOg05N8ySchsMp6rJfT9G00Lu5RWtPRnpQ38CcHOR1K54kpe+PLrs8M/bOR9yQdCLoEyqfdUxNfcBIE3d8NkLIjDC4MomoQftg6QdEUhlOCwXGQn1M6jyp2AlAgs/SGPHb3zT6Lr3MUKAbYeYbb912d5KYFeu97I5ls3cWVV/omU0iOU6OT0hRgWiy+EtHOzzIQtgXoARh/AZXovytJcKiSvhDi/jZ9UIGE5HCrPwNkQ2SdcrCFF/TKFsjNK+SYoibDgqdh4rgBUrI5yGGgBn3EdvkBZWr78IQjM4A0TwyjGC+R7BHVRipvoaKOtsO7NC5qqb+3NJasEymsS5tH6LxcA3odx/rs0=
-      #FTP_HOST
-    - secure: Q/MyM2VmEeW0z6ujxQAHS6GLMXE3Dguu75oSARykrFJGk85iNTij7OiHvqfTYSBdw/h+47zv/pjtHwD8os3LTmTKpMOu3PyMP+SOk6J1SGKUKx1J959GHMRw94Dqcr7RbGmQA5eVWq/GJzPJffhWcMOSSwXSIaYFZcBTXIYqMMmcxwSEULutfvyfzhOm+8psdHLQQhjX2QcYHNHJQTpJ6+WJ7tLpZIxg5iHSZe1dPRVpeozOJ/+hhxPWwi2XDNt3LG9VUg4jMF24HXcw5zJLgSZGV7oy+XUMrcRV27DzL/s+nGS4FM2TQbMal94FU0tSyTAA+Qj80hUNvlgL/tykmDRK+E2am+04SisUtuTVPLjVy52qqwt25tvbOQH9BjN5eieZxj4uYog1S3HL5BUa7032MZbToZzt8IuOxyfIKfGZBUYwyWLK5pPWxQwnZhGIFpH98m0wTAsggvCrr1n9mNJeYO0n0DymTt+xWqHE/MIxKU3aUo0RNWGXNIwrp4TjYOaf/GgeKAUMSI5TzLhKY2n3uPfCniM4p25Ysf0RmnMEKW0VsXpSWfyIAtwqnF1NGFU/RJn2X13LsYLxwzE8JJ1hSEW+QQ7k1ZJKEqZWYEvhbF+7RD/l5KkKgZD1L8FGLLUEK6eTY65/rQV+4gprAVFw43PnkYa2codUn48952A=
-      #FTP_DIR
-    - secure: Fh47PH2JNBtvr7Dbbzf/wG+HizL7bND63JyhY97kG7VHtXSeLwWTw13YvF0UDoWa+37NicTOKUgGemg7Mz+K4+GpOiTBUm5YNTpw8ECpdys9G4xZURsIqUYUxrr5k//TddvRP+4CaH0miOW3hKF4SSnT9BwJeTMxsZjQNsg78UKTOWhGQIkmXqbpgzWOFoUH5NrrNTe+KoIYRJ85DOtGLwjpuKKOivjd090MG18ZcQ63SqQ0TTTr3gGHgahrc/IPzSFFsPiLHWjpCk3EkbL8M+GaSQtJ8jUE7hqfTFXBZdB2ws8Z7qbjSwLY6o3YgvW53GGMH8DBpYOq+iKbQnUG7/v4YWBsuUOPRb6TbtSNHEZUfqeKo7Ku60roSNLanMmIPsvnbNnWy+wuA19g/4YIxwNJpx+FkACnYc9NSjrnLIS39mo4w3ngcM+YcNLIe1bmxOQVxr++BbmbbDj1dQng0JotfZtUNmEMmNFpE3q9xdNYQPfFBMor8DxqDYTJ4UB4MSNfmNnJd1Io9ccDf77AFltyHrKzV7bK/ZcV7YA/kMgxpCU3WEt0DmXWVsMaaMBlv+iwF2ebOaYQODIpbl8rAHTRhfsFfdpZkZSPwlQiwyWRoVYMdl5JZ6jOjlIrmRxMc9rySDlJA16Zf5Ha2fVb9SSMczFuR1qd6fOujpyGaio=
-      #CF_GLOBAL_API_KEY
-    - secure: kh18jMJa474a5ihcPgnX/DfiMb1F/vVES1Y2LTOn2khJEpDOAXOkE33GHUrh3aCEf1/Wi09FdXWGzLGcps7DIozGcYNHZDd9iFdud0GUfmDYhEbrnph8GQZx/JghxuRZ0p6NW4PTmyrvCyUly01WK994+tEkKjf7+VZfjaxbXqLOo1zsBgRIAKBST2zXo/eFI89wlp6up5yn8W2gsfon++5Ahtt9zEZYN8QoD26Ii+B05niEEjJ5wkKgvLBY58OCxFp4Gg6kq4AS4kj8+3S7mFn0l4WAoEqTGJEDy43iLhEQgCf0AhZLetPOXVwkUQ2w+nUup1jpCyGUjC7vZKGHMxJXW1V3NtLQTw+Q+TGCYFIBa/yCU0TMInHI9p3VpZl2I6PziqAaUOSoKMI6WkVUy91veb23+pTVKD0N6XQBB1RFZD1eIH9kPCFOoha453RxRYt2iv9ndhd5mNGLGbyDkiOZ18zl4hl/E9aG2Yl/CDaVzVGkKCxTPAHH7z4QKnKZLRyVL7ylktlcDydnAHI7x8/iHRkJF5hpcy3LldOO0DJXBIoIoD5i+Vd7tqCkcWM5E87PQUZeyUACogayrFOs2szhVIPq91TH68TbeLRQicZ4e5VIt8ASJqpalBFBjtI1NKDGrqGGT12pG1QMOdvK0lEIWMwnSxsBa0X0ERqaAuQ=
-      #CF_EMAIL
-    - secure: t+IYZ85pjetgRMA8/wdNvQp6vcY62yMA3J/YCVdIrmoT6Zg1rPLy9XObz242Htpj9Cn6g4rWgmYZ+YHmzJJ5rh2q33voMn1hwYUvkj76tOnwDR9Y1nZcYfSk3nly/Tn4U8xdrbt9VylPwztaccUp6WtcdSZ/NQ4MP1TGmmJvjq/wfrRZdyDltas5g+e5YkP4k3hByIm+t7TUb0fKuIVSCktnwUl4FvQvhgZT7tzOecmTE1Kiw7QMbs1B6Mr+DE2eYNBqJC8IGpMGdoCqVjv1vEj3/u8XTUA78kZwrc2vz6uiz6Vr2E4SjR7ryf0y1KCQMDYr5eUMVb3L4HjFpRnJ+93lL4kdoOkEfdpgn2PSck+vEDDpJ2MWXeE5Fzz7AO34sFSbBR90+OiDH32msI7a8bEIZ5y6zCaJmh4eppPhYCH8SffWOTDAzDUrlV0JTmJgyUvY8oCi4bUxYtHVrraRQLg5tk1MJNPRqbi3fhevUMweoeEyzSdCxRmgNjN41KBRVSMUHSyHcEpKALBxHESoPQ/B+54swUBFVZ3q5rbvFln1mKCWd23BQqCft2U+PWT1IcTStbPSNVWFF2mpaeNlDK6gOToF66uz0DHbN81RvydiB5ryBz6gHHnOwtry0dBAQ7eBHkTx5aTWyCl81mvoEbDFio4eYEIVTtJ3xr0KJ/Y=
-      #CF_FILTERLISTS_ZONE
-    - secure: a2mR9nIaDs+HdIyShSqigrlydYJ27eJPuNuRG5pZ/kuqlJkbXxsOHwjHXjn22ERQQJKwjXbZxgGQxf9Ef9WmFygTVW5WZdpWcOCE5IZBYSZikwU2M6WO9w3ENvNes8mgcOQM9EoNLZTFJQZB9SNIWhqZysW6jRFxNFdDrI0AdyjG/1u7jzC56zo79/oJs9g25mOaFCqnQWjE9N5/tTqW23MjQBQexCCAMyafvq65Jji8LY624bcyMg0vWNHfPdP0ZUIUhFgkpEBq9+6CjKwNougD0C4FqYFBmB3kVT/sEn6/oc2XdXkp1jEA7sdl1pFss8YrpRBcpbhz5kKePlujkorIr6xgqjJ2N9q2N23V6ekWnLu97ZuivSPfSQ8NPj0WHT4+AWagHRUFmgERtyI74y4UnA68ADmKuQBp1GPzsNhJ/4w3K/Tro0McjbH9ac7v2DfHPdCGBsnv93AK1opVUIB6pdacDqgwQk9/XbTd0wW3t4l4cLlSsgykPxydwA2R6lG+fFyLrviBiLdv+KTzD015y0VY339sPFwarRha2+uUYNcunSZtw0oarqHJQoJvhY1aoF2tBJ4MJG4h87tUecjhDbKSti+l/GNU/3oIMfTDnt/MqaA9Bnt/MwVDZBW0eY6koSzxbfePUOKbvPL8eI8Ax+aYoGKMestjW7sw1tk=
-deploy:
-  skip_cleanup: true
-  provider: script
-  script: scripts/deploy.sh
-  on:
-    branch: master
\ No newline at end of file
diff --git a/FilterLists.sln b/FilterLists.sln
index a93f225d4..548b9855f 100644
--- a/FilterLists.sln
+++ b/FilterLists.sln
@@ -44,7 +44,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ops", "ops", "{AF336194-8932-4C99-BF8B-30FF8EC146E9}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		.travis.yml = .travis.yml
 		azure-pipelines.yml = azure-pipelines.yml
 		codecov.yml = codecov.yml
 	EndProjectSection
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d6f40c5c1..45b06c9b4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,17 +1,12 @@
-# ASP.NET Core
-# Build and test ASP.NET Core projects targeting .NET Core.
-# Add steps that run tests, create a NuGet package, deploy, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core
-
 trigger:
-- master
+  - docker-devops
 
 pool:
-  vmImage: 'Ubuntu-16.04'
+  vmImage: "Ubuntu-16.04"
 
 variables:
-  buildConfiguration: 'Release'
+  buildConfiguration: "Release"
 
 steps:
-- script: dotnet build --configuration $(buildConfiguration)
-  displayName: 'dotnet build $(buildConfiguration)'
+  - script: dotnet build --configuration $(buildConfiguration)
+    displayName: "dotnet build $(buildConfiguration)"
diff --git a/codecov.yml b/codecov.yml
index 507fc9694..f6272f5f1 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -5,4 +5,4 @@ coverage:
         enabled: no
     patch:
       default:
-        enabled: no
\ No newline at end of file
+        enabled: no
diff --git a/docker-compose.yml b/docker-compose.yml
index faa602e52..787e01a5c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,35 +1,40 @@
-version: '3.7'
+version: "3.7"
 services:
-    FilterLists.MariaDB:
-        image: mariadb:latest
-        environment:
-            MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
-            MYSQL_DATABASE: filterlistsdata
-            MYSQL_USER: filterlists
-            MYSQL_PASSWORD: C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833
-        command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_520_ci']
-    FilterLists.Api:
-        image: 'filterlists.api'
-        build:
-            context: .
-            dockerfile: src/FilterLists.Api/Dockerfile
-        expose:
-            - "80/tcp"
-        depends_on:
-            - FilterLists.MariaDB
-    FilterLists.Web:
-        image: 'filterlists.web'
-        build:
-            context: src/FilterLists.Web
-        expose:
-            - "80/tcp"
-    FilterLists.NGINX:
-        image: 'nginx:stable-alpine'
-        build:
-            context: ./ops/nginx
-        ports:
-            - '80:80/tcp'
-            - '443:443/tcp'
-        links:
-            - FilterLists.Api
-            - FilterLists.Web
\ No newline at end of file
+  FilterLists.MariaDB:
+    image: mariadb:latest
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+      MYSQL_DATABASE: filterlistsdata
+      MYSQL_USER: filterlists
+      MYSQL_PASSWORD: C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833
+    command:
+      [
+        "mysqld",
+        "--character-set-server=utf8mb4",
+        "--collation-server=utf8mb4_unicode_520_ci",
+      ]
+  FilterLists.Api:
+    image: "filterlists.api"
+    build:
+      context: .
+      dockerfile: src/FilterLists.Api/Dockerfile
+    expose:
+      - "80/tcp"
+    depends_on:
+      - FilterLists.MariaDB
+  FilterLists.Web:
+    image: "filterlists.web"
+    build:
+      context: src/FilterLists.Web
+    expose:
+      - "80/tcp"
+  FilterLists.NGINX:
+    image: "nginx:stable-alpine"
+    build:
+      context: ./ops/nginx
+    ports:
+      - "80:80/tcp"
+      - "443:443/tcp"
+    links:
+      - FilterLists.Api
+      - FilterLists.Web