From 4a75cea7c4e42d66280d625e06afc336bcf7458c Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Thu, 25 Apr 2019 19:33:55 -0500
Subject: [PATCH] rm unused pipelines yml, misc clenaup

---
 FilterLists.sln         |  5 ++---
 docker-compose.prod.yml |  3 +++
 docker-compose.yml      | 16 +++++-----------
 ops/azure-pipelines.yml | 28 ----------------------------
 4 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 ops/azure-pipelines.yml

diff --git a/FilterLists.sln b/FilterLists.sln
index 6d3733edf..debd5aa7b 100644
--- a/FilterLists.sln
+++ b/FilterLists.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Api", "src\FilterLists.Api\FilterLists.Api.csproj", "{57E4CE18-41F3-48F6-B142-12947FFBA86C}"
 EndProject
@@ -44,7 +44,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ops", "ops", "{AF336194-8932-4C99-BF8B-30FF8EC146E9}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		ops\azure-pipelines.yml = ops\azure-pipelines.yml
 		codecov.yml = codecov.yml
 	EndProjectSection
 EndProject
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 4a82b3ee1..cf45102ac 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,6 +1,9 @@
 version: "3.7"
+
 services:
+
   FilterLists.Api:
     image: collinbarrett/filterlists.api:latest
+
   FilterLists.Web:
     image: collinbarrett/filterlists.web:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c799d392..0a8eeb1a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
 version: "3.7"
+
 services:
+
   FilterLists.MariaDB:
-    image: mariadb:latest
+    image: mariadb:10
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "yes"
       MYSQL_DATABASE: filterlistsdata
@@ -13,6 +15,7 @@ services:
         "--character-set-server=utf8mb4",
         "--collation-server=utf8mb4_unicode_520_ci",
       ]
+
   FilterLists.Api:
     image: "collinbarrett/filterlists.api"
     build:
@@ -22,19 +25,10 @@ services:
       - "80/tcp"
     depends_on:
       - FilterLists.MariaDB
+
   FilterLists.Web:
     image: "collinbarrett/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
diff --git a/ops/azure-pipelines.yml b/ops/azure-pipelines.yml
deleted file mode 100644
index 73fbd3b5b..000000000
--- a/ops/azure-pipelines.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-trigger:
-    - docker-devops
-resources:
-    -
-        repo: self
-        clean: true
-pool:
-    vmImage: 'Hosted Ubuntu 1604'
-steps:
-    -
-        task: DockerCompose@0
-        displayName: build
-        inputs:
-            containerregistrytype: 'Container Registry'
-            dockerRegistryEndpoint: 'Docker Hub - collinbarrett'
-            dockerComposeFile: docker-compose.yml
-            dockerComposeCommand: build
-    -
-        task: DockerCompose@0
-        displayName: push
-        inputs:
-            containerregistrytype: 'Container Registry'
-            dockerRegistryEndpoint: 'Docker Hub - collinbarrett'
-            dockerComposeFile: docker-compose.yml
-            dockerComposeCommand: 'push --ignore-push-failures'
-    -
-        task: PublishBuildArtifacts@1
-        displayName: publish