rm unused pipelines yml, misc clenaup

This commit is contained in:
Collin M. Barrett 2019-04-25 19:33:55 -05:00
parent 009910725d
commit 4a75cea7c4
4 changed files with 10 additions and 42 deletions

View file

@ -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

View file

@ -1,6 +1,9 @@
version: "3.7"
services:
FilterLists.Api:
image: collinbarrett/filterlists.api:latest
FilterLists.Web:
image: collinbarrett/filterlists.web:latest

View file

@ -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

View file

@ -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