From 242ddbdd32f09f5d1e093907e93f9e7d6aec7378 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 10 Sep 2020 17:22:09 -0500 Subject: [PATCH] =?UTF-8?q?refactor(services):=20=E2=99=BB=F0=9F=8E=A8=20r?= =?UTF-8?q?m=20un-useful=20'src'=20and=20'tests'=20sub-dirs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 24 ++++++------- docker-compose.directory.migrations.tests.yml | 4 +-- docker-compose.override.yml | 4 +-- docker-compose.prod.build.yml | 4 +-- services/.dockerignore | 2 +- .../FilterLists.Archival.Api/Dockerfile | 29 ++++++++++++++++ .../FilterLists.Archival.Api/Dockerfile.dev | 29 ++++++++++++++++ .../FilterLists.Archival.Api.csproj | 0 .../FilterLists.Archival.Api/Program.cs | 0 .../Properties/launchSettings.json | 0 .../FilterLists.Archival.Api/Startup.cs | 0 .../ConfigurationExtensions.cs | 0 .../FilterLists.Archival.Application.csproj | 0 .../ConfigurationExtensions.cs | 0 ...FilterLists.Archival.Infrastructure.csproj | 0 .../Options/GitOptions.cs | 0 .../Persistence/ConfigurationExtensions.cs | 0 .../Persistence/GitFileArchiver.cs | 0 .../Persistence/IArchiveFile.cs | 0 .../Scheduling/ConfigurationExtensions.cs | 0 .../src/FilterLists.Archival.Api/Dockerfile | 29 ---------------- .../FilterLists.Archival.Api/Dockerfile.dev | 29 ---------------- .../Controllers/LanguagesController.cs | 0 .../Controllers/LicensesController.cs | 0 .../Controllers/ListsController.cs | 0 .../Controllers/MaintainersController.cs | 0 .../Controllers/SoftwareController.cs | 0 .../Controllers/SyntaxesController.cs | 0 .../Controllers/TagsController.cs | 0 .../FilterLists.Directory.Api/Dockerfile | 34 +++++++++++++++++++ .../FilterLists.Directory.Api/Dockerfile.dev | 34 +++++++++++++++++++ .../Dockerfile.migrate | 27 +++++++++++++++ .../FilterLists.Directory.Api.csproj | 0 .../FilterLists.Directory.Api/Program.cs | 0 .../Properties/launchSettings.json | 0 .../FilterLists.Directory.Api/Startup.cs | 0 .../SwaggerExtensions.cs | 0 .../appsettings.Development.json | 0 .../ConfigurationExtensions.cs | 0 .../FilterLists.Directory.Application.csproj | 0 .../Queries/GetLanguages.cs | 0 .../Queries/GetLicenses.cs | 0 .../Queries/GetListDetails.cs | 0 .../Queries/GetLists.cs | 0 .../Queries/GetMaintainers.cs | 0 .../Queries/GetSoftware.cs | 0 .../Queries/GetSyntaxes.cs | 0 .../Queries/GetTags.cs | 0 .../FilterLists.Directory.Domain.csproj | 0 ...ory.Infrastructure.Migrations.Tests.csproj | 0 .../SeedQueryDbContextTest.cs | 0 ...Directory.Infrastructure.Migrations.csproj | 0 .../20200828014014_Initial.Designer.cs | 0 .../Migrations/20200828014014_Initial.cs | 0 .../20200828171318_InitialData.Designer.cs | 0 .../Migrations/20200828171318_InitialData.cs | 0 .../20200906194729_1922.Designer.cs | 0 .../Migrations/20200906194729_1922.cs | 0 .../20200907224357_1943.Designer.cs | 0 .../Migrations/20200907224357_1943.cs | 0 .../20200909155351_1960.Designer.cs | 0 .../Migrations/20200909155351_1960.cs | 0 .../20200910091959_1962.Designer.cs | 0 .../Migrations/20200910091959_1962.cs | 0 .../Migrations/QueryDbContextModelSnapshot.cs | 0 .../ConfigurationExtensions.cs | 0 ...ilterLists.Directory.Infrastructure.csproj | 0 .../Queries/Context/IQueryContext.cs | 0 .../Queries/Context/QueryContext.cs | 0 .../Queries/Context/QueryDbContext.cs | 0 .../Persistence/Queries/Entities/Dependent.cs | 0 .../Queries/Entities/FilterList.cs | 0 .../Queries/Entities/FilterListLanguage.cs | 0 .../Queries/Entities/FilterListMaintainer.cs | 0 .../Queries/Entities/FilterListSyntax.cs | 0 .../Queries/Entities/FilterListTag.cs | 0 .../Queries/Entities/FilterListViewUrl.cs | 0 .../Persistence/Queries/Entities/Fork.cs | 0 .../Persistence/Queries/Entities/Language.cs | 0 .../Persistence/Queries/Entities/License.cs | 0 .../Queries/Entities/Maintainer.cs | 0 .../Persistence/Queries/Entities/Merge.cs | 0 .../Persistence/Queries/Entities/Software.cs | 0 .../Queries/Entities/SoftwareSyntax.cs | 0 .../Persistence/Queries/Entities/Syntax.cs | 0 .../Persistence/Queries/Entities/Tag.cs | 0 .../Persistence/SeedExtensions.cs | 0 services/Directory/azure-pipelines.api.yaml | 22 ++++++------ .../Directory/azure-pipelines.migrate.yaml | 2 +- .../src/FilterLists.Directory.Api/Dockerfile | 34 ------------------- .../FilterLists.Directory.Api/Dockerfile.dev | 34 ------------------- .../Dockerfile.migrate | 27 --------------- services/FilterLists.sln | 2 +- services/FilterLists.sln.DotSettings | 9 ++--- .../ConfigurationBuilder.cs | 0 .../ConfigurationExtensions.cs | 0 .../FilterLists.SharedKernel.Logging.csproj | 0 .../HostRunner.cs | 0 98 files changed, 190 insertions(+), 189 deletions(-) create mode 100644 services/Archival/FilterLists.Archival.Api/Dockerfile create mode 100644 services/Archival/FilterLists.Archival.Api/Dockerfile.dev rename services/Archival/{src => }/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj (100%) rename services/Archival/{src => }/FilterLists.Archival.Api/Program.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Api/Properties/launchSettings.json (100%) rename services/Archival/{src => }/FilterLists.Archival.Api/Startup.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Application/ConfigurationExtensions.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/Options/GitOptions.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs (100%) rename services/Archival/{src => }/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs (100%) delete mode 100644 services/Archival/src/FilterLists.Archival.Api/Dockerfile delete mode 100644 services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/LanguagesController.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/LicensesController.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/ListsController.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/MaintainersController.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/SoftwareController.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/SyntaxesController.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Controllers/TagsController.cs (100%) create mode 100644 services/Directory/FilterLists.Directory.Api/Dockerfile create mode 100644 services/Directory/FilterLists.Directory.Api/Dockerfile.dev create mode 100644 services/Directory/FilterLists.Directory.Api/Dockerfile.migrate rename services/Directory/{src => }/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Program.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Properties/launchSettings.json (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/Startup.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/SwaggerExtensions.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Api/appsettings.Development.json (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/ConfigurationExtensions.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetLanguages.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetLicenses.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetListDetails.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetLists.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetMaintainers.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetSoftware.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetSyntaxes.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Application/Queries/GetTags.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj (100%) rename services/Directory/{tests => }/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj (100%) rename services/Directory/{tests => }/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs (100%) rename services/Directory/{src => }/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs (100%) delete mode 100644 services/Directory/src/FilterLists.Directory.Api/Dockerfile delete mode 100644 services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev delete mode 100644 services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate rename services/SharedKernel/{src => }/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs (100%) rename services/SharedKernel/{src => }/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs (100%) rename services/SharedKernel/{src => }/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj (100%) rename services/SharedKernel/{src => }/FilterLists.SharedKernel.Logging/HostRunner.cs (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7abed2564..9afd29f7b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,73 +1,73 @@ version: 2 updates: - package-ecosystem: nuget - directory: "/services/SharedKernel/src/FilterLists.SharedKernel.Logging" + directory: "/services/SharedKernel/FilterLists.SharedKernel.Logging" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: docker - directory: "/services/Archival/src/FilterLists.Archival.Api" + directory: "/services/Archival/FilterLists.Archival.Api" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Archival/src/FilterLists.Archival.Api" + directory: "/services/Archival/FilterLists.Archival.Api" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Archival/src/FilterLists.Archival.Application" + directory: "/services/Archival/FilterLists.Archival.Application" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Archival/src/FilterLists.Archival.Infrastructure" + directory: "/services/Archival/FilterLists.Archival.Infrastructure" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: docker - directory: "/services/Directory/src/FilterLists.Directory.Api" + directory: "/services/Directory/FilterLists.Directory.Api" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Directory/src/FilterLists.Directory.Api" + directory: "/services/Directory/FilterLists.Directory.Api" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations" + directory: "/services/Directory/FilterLists.Directory.Infrastructure.Migrations" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Directory/src/FilterLists.Directory.Infrastructure" + directory: "/services/Directory/FilterLists.Directory.Infrastructure" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Directory/src/FilterLists.Directory.Application" + directory: "/services/Directory/FilterLists.Directory.Application" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Directory/src/FilterLists.Directory.Domain" + directory: "/services/Directory/FilterLists.Directory.Domain" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: nuget - directory: "/services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests" + directory: "/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests" schedule: interval: daily time: "11:00" diff --git a/docker-compose.directory.migrations.tests.yml b/docker-compose.directory.migrations.tests.yml index 254c19cea..76f1b0844 100644 --- a/docker-compose.directory.migrations.tests.yml +++ b/docker-compose.directory.migrations.tests.yml @@ -4,10 +4,10 @@ services: directory-migrations-tests: build: context: ./services - dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile.migrate + dockerfile: Directory/FilterLists.Directory.Api/Dockerfile.migrate target: test-migrations volumes: - - directory-migrations-tests-results:/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults + - directory-migrations-tests-results:/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults depends_on: - directory-db environment: diff --git a/docker-compose.override.yml b/docker-compose.override.yml index ae346406b..8c1f95d5d 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -13,14 +13,14 @@ services: archival-api: build: context: ./services - dockerfile: Archival/src/FilterLists.Archival.Api/Dockerfile.dev + dockerfile: Archival/FilterLists.Archival.Api/Dockerfile.dev environment: - ASPNETCORE_ENVIRONMENT=Development directory-api: build: context: ./services - dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile.dev + dockerfile: Directory/FilterLists.Directory.Api/Dockerfile.dev environment: - ASPNETCORE_ENVIRONMENT=Development diff --git a/docker-compose.prod.build.yml b/docker-compose.prod.build.yml index ec1e8cb97..0091c58c3 100644 --- a/docker-compose.prod.build.yml +++ b/docker-compose.prod.build.yml @@ -7,12 +7,12 @@ services: archival-api: build: context: ./services - dockerfile: Archival/src/FilterLists.Archival.Api/Dockerfile + dockerfile: Archival/FilterLists.Archival.Api/Dockerfile directory-api: build: context: ./services - dockerfile: Directory/src/FilterLists.Directory.Api/Dockerfile + dockerfile: Directory/FilterLists.Directory.Api/Dockerfile web: build: diff --git a/services/.dockerignore b/services/.dockerignore index cf4b41523..c70cb1dfb 100644 --- a/services/.dockerignore +++ b/services/.dockerignore @@ -31,5 +31,5 @@ README.md **/azure-pipelines*.yaml **/*.sln **/*.sln.DotSettings -Directory/src/FilterLists.Directory.Api/appsettings.Development.json +Directory/FilterLists.Directory.Api/appsettings.Development.json Directory/data/* \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile new file mode 100644 index 000000000..3d5a5a191 --- /dev/null +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -0,0 +1,29 @@ +# init base +FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base +WORKDIR /app + +# init build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build + +# restore API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/FilterLists.Archival.Infrastructure/ +COPY Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/FilterLists.Archival.Application/ +WORKDIR /app/Archival/FilterLists.Archival.Api +COPY Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj . +RUN dotnet restore + +# build API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archival.Infrastructure/ +COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ +WORKDIR /app/Archival/FilterLists.Archival.Api +COPY Archival/FilterLists.Archival.Api/. . +RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 + +# package final +FROM base AS final +COPY --from=build /app/publish . +ENTRYPOINT ./FilterLists.Archival.Api \ No newline at end of file diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile.dev b/services/Archival/FilterLists.Archival.Api/Dockerfile.dev new file mode 100644 index 000000000..c56a3a8aa --- /dev/null +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile.dev @@ -0,0 +1,29 @@ +# init base for Visual Studio debugging +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base +WORKDIR /app + +# init build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build + +# restore API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/FilterLists.Archival.Infrastructure/ +COPY Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/FilterLists.Archival.Application/ +WORKDIR /app/Archival/FilterLists.Archival.Api +COPY Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj . +RUN dotnet restore + +# build API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archival.Infrastructure/ +COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ +WORKDIR /app/Archival/FilterLists.Archival.Api +COPY Archival/FilterLists.Archival.Api/. . +RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64 + +# package final +FROM base AS final +COPY --from=build /app/publish . +ENTRYPOINT ./FilterLists.Archival.Api \ No newline at end of file diff --git a/services/Archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj similarity index 100% rename from services/Archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj rename to services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj diff --git a/services/Archival/src/FilterLists.Archival.Api/Program.cs b/services/Archival/FilterLists.Archival.Api/Program.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Api/Program.cs rename to services/Archival/FilterLists.Archival.Api/Program.cs diff --git a/services/Archival/src/FilterLists.Archival.Api/Properties/launchSettings.json b/services/Archival/FilterLists.Archival.Api/Properties/launchSettings.json similarity index 100% rename from services/Archival/src/FilterLists.Archival.Api/Properties/launchSettings.json rename to services/Archival/FilterLists.Archival.Api/Properties/launchSettings.json diff --git a/services/Archival/src/FilterLists.Archival.Api/Startup.cs b/services/Archival/FilterLists.Archival.Api/Startup.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Api/Startup.cs rename to services/Archival/FilterLists.Archival.Api/Startup.cs diff --git a/services/Archival/src/FilterLists.Archival.Application/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Application/ConfigurationExtensions.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Application/ConfigurationExtensions.cs rename to services/Archival/FilterLists.Archival.Application/ConfigurationExtensions.cs diff --git a/services/Archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj b/services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj similarity index 100% rename from services/Archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj rename to services/Archival/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs rename to services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj rename to services/Archival/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/Options/GitOptions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Options/GitOptions.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/Options/GitOptions.cs rename to services/Archival/FilterLists.Archival.Infrastructure/Options/GitOptions.cs diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs rename to services/Archival/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs rename to services/Archival/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs rename to services/Archival/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs diff --git a/services/Archival/src/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs similarity index 100% rename from services/Archival/src/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs rename to services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs diff --git a/services/Archival/src/FilterLists.Archival.Api/Dockerfile b/services/Archival/src/FilterLists.Archival.Api/Dockerfile deleted file mode 100644 index c07d9b693..000000000 --- a/services/Archival/src/FilterLists.Archival.Api/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -# init base -FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base -WORKDIR /app - -# init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build - -# restore API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/src/FilterLists.Archival.Infrastructure/ -COPY Archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/src/FilterLists.Archival.Application/ -WORKDIR /app/Archival/src/FilterLists.Archival.Api -COPY Archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj . -RUN dotnet restore - -# build API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Archival/src/FilterLists.Archival.Infrastructure/. Archival/src/FilterLists.Archival.Infrastructure/ -COPY Archival/src/FilterLists.Archival.Application/. Archival/src/FilterLists.Archival.Application/ -WORKDIR /app/Archival/src/FilterLists.Archival.Api -COPY Archival/src/FilterLists.Archival.Api/. . -RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 - -# package final -FROM base AS final -COPY --from=build /app/publish . -ENTRYPOINT ./FilterLists.Archival.Api \ No newline at end of file diff --git a/services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev b/services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev deleted file mode 100644 index 28e4e5d07..000000000 --- a/services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev +++ /dev/null @@ -1,29 +0,0 @@ -# init base for Visual Studio debugging -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base -WORKDIR /app - -# init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build - -# restore API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj Archival/src/FilterLists.Archival.Infrastructure/ -COPY Archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj Archival/src/FilterLists.Archival.Application/ -WORKDIR /app/Archival/src/FilterLists.Archival.Api -COPY Archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj . -RUN dotnet restore - -# build API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Archival/src/FilterLists.Archival.Infrastructure/. Archival/src/FilterLists.Archival.Infrastructure/ -COPY Archival/src/FilterLists.Archival.Application/. Archival/src/FilterLists.Archival.Application/ -WORKDIR /app/Archival/src/FilterLists.Archival.Api -COPY Archival/src/FilterLists.Archival.Api/. . -RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64 - -# package final -FROM base AS final -COPY --from=build /app/publish . -ENTRYPOINT ./FilterLists.Archival.Api \ No newline at end of file diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/LanguagesController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/LanguagesController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/LicensesController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/LicensesController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/ListsController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/MaintainersController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/MaintainersController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/SoftwareController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/SoftwareController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/SyntaxesController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/SyntaxesController.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/TagsController.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs rename to services/Directory/FilterLists.Directory.Api/Controllers/TagsController.cs diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile b/services/Directory/FilterLists.Directory.Api/Dockerfile new file mode 100644 index 000000000..cc1b3f437 --- /dev/null +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile @@ -0,0 +1,34 @@ +# init base +FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base +WORKDIR /app +EXPOSE 80 + +# init build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build + +# restore API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/FilterLists.Directory.Domain/ +COPY Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/FilterLists.Directory.Infrastructure/ +COPY Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/ +WORKDIR /app/Directory/FilterLists.Directory.Api +COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . +RUN dotnet restore + +# build API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Directory/FilterLists.Directory.Domain/. Directory/FilterLists.Directory.Domain/ +COPY Directory/FilterLists.Directory.Infrastructure/. Directory/FilterLists.Directory.Infrastructure/ +COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ +WORKDIR /app/Directory/FilterLists.Directory.Api +COPY Directory/FilterLists.Directory.Api/. . +RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 + +# package final +FROM base AS final +COPY --from=build /app/publish . +ENTRYPOINT ./FilterLists.Directory.Api \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile.dev b/services/Directory/FilterLists.Directory.Api/Dockerfile.dev new file mode 100644 index 000000000..5f544c4ab --- /dev/null +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile.dev @@ -0,0 +1,34 @@ +# init base for Visual Studio debugging +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base +WORKDIR /app +EXPOSE 80 + +# init build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build + +# restore API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/FilterLists.Directory.Domain/ +COPY Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/FilterLists.Directory.Infrastructure/ +COPY Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/ +WORKDIR /app/Directory/FilterLists.Directory.Api +COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . +RUN dotnet restore + +# build API +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Directory/FilterLists.Directory.Domain/. Directory/FilterLists.Directory.Domain/ +COPY Directory/FilterLists.Directory.Infrastructure/. Directory/FilterLists.Directory.Infrastructure/ +COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ +WORKDIR /app/Directory/FilterLists.Directory.Api +COPY Directory/FilterLists.Directory.Api/. . +RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64 + +# package final +FROM base AS final +COPY --from=build /app/publish . +ENTRYPOINT ./FilterLists.Directory.Api \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Api/Dockerfile.migrate b/services/Directory/FilterLists.Directory.Api/Dockerfile.migrate new file mode 100644 index 000000000..84d8da1da --- /dev/null +++ b/services/Directory/FilterLists.Directory.Api/Dockerfile.migrate @@ -0,0 +1,27 @@ +# init test-migrations +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS test-migrations +ENTRYPOINT ["dotnet", "test", "--logger:trx"] + +# restore +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/FilterLists.Directory.Domain/ +COPY Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/FilterLists.Directory.Infrastructure/ +COPY Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/FilterLists.Directory.Application/ +COPY Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj Directory/FilterLists.Directory.Api/ +WORKDIR /app/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests +COPY Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj . +RUN dotnet restore + +# build +WORKDIR /app +COPY SharedKernel/FilterLists.SharedKernel.Logging/. SharedKernel/FilterLists.SharedKernel.Logging/ +COPY Directory/FilterLists.Directory.Domain/. Directory/FilterLists.Directory.Domain/ +COPY Directory/FilterLists.Directory.Infrastructure/. Directory/FilterLists.Directory.Infrastructure/ +COPY Directory/FilterLists.Directory.Infrastructure.Migrations/. Directory/FilterLists.Directory.Infrastructure.Migrations/ +COPY Directory/FilterLists.Directory.Application/. Directory/FilterLists.Directory.Application/ +COPY Directory/FilterLists.Directory.Api/. Directory/FilterLists.Directory.Api/ +WORKDIR /app/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests +COPY Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/. . +RUN dotnet build -c Release --no-restore -r linux-musl-x64 \ No newline at end of file diff --git a/services/Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj rename to services/Directory/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj diff --git a/services/Directory/src/FilterLists.Directory.Api/Program.cs b/services/Directory/FilterLists.Directory.Api/Program.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Program.cs rename to services/Directory/FilterLists.Directory.Api/Program.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/Properties/launchSettings.json b/services/Directory/FilterLists.Directory.Api/Properties/launchSettings.json similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Properties/launchSettings.json rename to services/Directory/FilterLists.Directory.Api/Properties/launchSettings.json diff --git a/services/Directory/src/FilterLists.Directory.Api/Startup.cs b/services/Directory/FilterLists.Directory.Api/Startup.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/Startup.cs rename to services/Directory/FilterLists.Directory.Api/Startup.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/SwaggerExtensions.cs b/services/Directory/FilterLists.Directory.Api/SwaggerExtensions.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/SwaggerExtensions.cs rename to services/Directory/FilterLists.Directory.Api/SwaggerExtensions.cs diff --git a/services/Directory/src/FilterLists.Directory.Api/appsettings.Development.json b/services/Directory/FilterLists.Directory.Api/appsettings.Development.json similarity index 100% rename from services/Directory/src/FilterLists.Directory.Api/appsettings.Development.json rename to services/Directory/FilterLists.Directory.Api/appsettings.Development.json diff --git a/services/Directory/src/FilterLists.Directory.Application/ConfigurationExtensions.cs b/services/Directory/FilterLists.Directory.Application/ConfigurationExtensions.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/ConfigurationExtensions.cs rename to services/Directory/FilterLists.Directory.Application/ConfigurationExtensions.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj rename to services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetListDetails.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetLists.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetMaintainers.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetSoftware.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs diff --git a/services/Directory/src/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Application/Queries/GetTags.cs rename to services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs diff --git a/services/Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj similarity index 100% rename from services/Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj rename to services/Directory/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj diff --git a/services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj b/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj similarity index 100% rename from services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj diff --git a/services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs similarity index 100% rename from services/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations.Tests/SeedQueryDbContextTest.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.Designer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828014014_Initial.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.Designer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200828171318_InitialData.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.Designer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200906194729_1922.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.Designer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200907224357_1943.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.Designer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200909155351_1960.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.Designer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200910091959_1962.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs b/services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs rename to services/Directory/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs b/services/Directory/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs rename to services/Directory/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj rename to services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs diff --git a/services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs similarity index 100% rename from services/Directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs rename to services/Directory/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs diff --git a/services/Directory/azure-pipelines.api.yaml b/services/Directory/azure-pipelines.api.yaml index 5ba6b24dc..a911b9e9d 100644 --- a/services/Directory/azure-pipelines.api.yaml +++ b/services/Directory/azure-pipelines.api.yaml @@ -6,11 +6,11 @@ trigger: include: [ services/Directory/azure-pipelines.api.yaml, - services/Directory/src/FilterLists.Directory.Domain/*, - services/Directory/src/FilterLists.Directory.Infrastructure/*, - services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/*, - services/Directory/src/FilterLists.Directory.Application/*, - services/Directory/src/FilterLists.Directory.Api/*, + services/Directory/FilterLists.Directory.Domain/*, + services/Directory/FilterLists.Directory.Infrastructure/*, + services/Directory/FilterLists.Directory.Infrastructure.Migrations/*, + services/Directory/FilterLists.Directory.Application/*, + services/Directory/FilterLists.Directory.Api/*, docker-compose.yml, docker-compose.prod.yml, .env, @@ -25,11 +25,11 @@ pr: include: [ services/Directory/azure-pipelines.api.yaml, - services/Directory/src/FilterLists.Directory.Domain/*, - services/Directory/src/FilterLists.Directory.Infrastructure/*, - services/Directory/src/FilterLists.Directory.Infrastructure.Migrations/*, - services/Directory/src/FilterLists.Directory.Application/*, - services/Directory/src/FilterLists.Directory.Api/*, + services/Directory/FilterLists.Directory.Domain/*, + services/Directory/FilterLists.Directory.Infrastructure/*, + services/Directory/FilterLists.Directory.Infrastructure.Migrations/*, + services/Directory/FilterLists.Directory.Application/*, + services/Directory/FilterLists.Directory.Api/*, docker-compose.yml, docker-compose.prod.yml, .env, @@ -53,7 +53,7 @@ steps: containerRegistry: github-container-registry repository: collinbarrett/filterlists-directory-api command: build - Dockerfile: services/Directory/src/FilterLists.Directory.Api/Dockerfile + Dockerfile: services/Directory/FilterLists.Directory.Api/Dockerfile buildContext: ./services tags: | latest diff --git a/services/Directory/azure-pipelines.migrate.yaml b/services/Directory/azure-pipelines.migrate.yaml index abe032cf7..ecc38c93b 100644 --- a/services/Directory/azure-pipelines.migrate.yaml +++ b/services/Directory/azure-pipelines.migrate.yaml @@ -131,7 +131,7 @@ steps: condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded()) inputs: targetType: inline - workingDirectory: services/Directory/src/FilterLists.Directory.Infrastructure.Migrations + workingDirectory: services/Directory/FilterLists.Directory.Infrastructure.Migrations script: | DIFF=$(git status -s -- . | wc -l) echo "$DIFF file(s) changed" diff --git a/services/Directory/src/FilterLists.Directory.Api/Dockerfile b/services/Directory/src/FilterLists.Directory.Api/Dockerfile deleted file mode 100644 index b2d438fe2..000000000 --- a/services/Directory/src/FilterLists.Directory.Api/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# init base -FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base -WORKDIR /app -EXPOSE 80 - -# init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build - -# restore API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/src/FilterLists.Directory.Domain/ -COPY Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/src/FilterLists.Directory.Infrastructure/ -COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/src/FilterLists.Directory.Infrastructure.Migrations/ -COPY Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/src/FilterLists.Directory.Application/ -WORKDIR /app/Directory/src/FilterLists.Directory.Api -COPY Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . -RUN dotnet restore - -# build API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Directory/src/FilterLists.Directory.Domain/. Directory/src/FilterLists.Directory.Domain/ -COPY Directory/src/FilterLists.Directory.Infrastructure/. Directory/src/FilterLists.Directory.Infrastructure/ -COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/. Directory/src/FilterLists.Directory.Infrastructure.Migrations/ -COPY Directory/src/FilterLists.Directory.Application/. Directory/src/FilterLists.Directory.Application/ -WORKDIR /app/Directory/src/FilterLists.Directory.Api -COPY Directory/src/FilterLists.Directory.Api/. . -RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 - -# package final -FROM base AS final -COPY --from=build /app/publish . -ENTRYPOINT ./FilterLists.Directory.Api \ No newline at end of file diff --git a/services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev b/services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev deleted file mode 100644 index 7300a1153..000000000 --- a/services/Directory/src/FilterLists.Directory.Api/Dockerfile.dev +++ /dev/null @@ -1,34 +0,0 @@ -# init base for Visual Studio debugging -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base -WORKDIR /app -EXPOSE 80 - -# init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build - -# restore API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/src/FilterLists.Directory.Domain/ -COPY Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/src/FilterLists.Directory.Infrastructure/ -COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/src/FilterLists.Directory.Infrastructure.Migrations/ -COPY Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/src/FilterLists.Directory.Application/ -WORKDIR /app/Directory/src/FilterLists.Directory.Api -COPY Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj . -RUN dotnet restore - -# build API -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Directory/src/FilterLists.Directory.Domain/. Directory/src/FilterLists.Directory.Domain/ -COPY Directory/src/FilterLists.Directory.Infrastructure/. Directory/src/FilterLists.Directory.Infrastructure/ -COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/. Directory/src/FilterLists.Directory.Infrastructure.Migrations/ -COPY Directory/src/FilterLists.Directory.Application/. Directory/src/FilterLists.Directory.Application/ -WORKDIR /app/Directory/src/FilterLists.Directory.Api -COPY Directory/src/FilterLists.Directory.Api/. . -RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64 - -# package final -FROM base AS final -COPY --from=build /app/publish . -ENTRYPOINT ./FilterLists.Directory.Api \ No newline at end of file diff --git a/services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate b/services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate deleted file mode 100644 index ec0d31c1d..000000000 --- a/services/Directory/src/FilterLists.Directory.Api/Dockerfile.migrate +++ /dev/null @@ -1,27 +0,0 @@ -# init test-migrations -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS test-migrations -ENTRYPOINT ["dotnet", "test", "--logger:trx"] - -# restore -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj Directory/src/FilterLists.Directory.Domain/ -COPY Directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj Directory/src/FilterLists.Directory.Infrastructure/ -COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj Directory/src/FilterLists.Directory.Infrastructure.Migrations/ -COPY Directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj Directory/src/FilterLists.Directory.Application/ -COPY Directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj Directory/src/FilterLists.Directory.Api/ -WORKDIR /app/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests -COPY Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/FilterLists.Directory.Infrastructure.Migrations.Tests.csproj . -RUN dotnet restore - -# build -WORKDIR /app -COPY SharedKernel/src/FilterLists.SharedKernel.Logging/. SharedKernel/src/FilterLists.SharedKernel.Logging/ -COPY Directory/src/FilterLists.Directory.Domain/. Directory/src/FilterLists.Directory.Domain/ -COPY Directory/src/FilterLists.Directory.Infrastructure/. Directory/src/FilterLists.Directory.Infrastructure/ -COPY Directory/src/FilterLists.Directory.Infrastructure.Migrations/. Directory/src/FilterLists.Directory.Infrastructure.Migrations/ -COPY Directory/src/FilterLists.Directory.Application/. Directory/src/FilterLists.Directory.Application/ -COPY Directory/src/FilterLists.Directory.Api/. Directory/src/FilterLists.Directory.Api/ -WORKDIR /app/Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests -COPY Directory/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/. . -RUN dotnet build -c Release --no-restore -r linux-musl-x64 \ No newline at end of file diff --git a/services/FilterLists.sln b/services/FilterLists.sln index 8b96ab8d3..8964f5331 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -48,7 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{8F419098-3 Directory\data\Tag.json = Directory\data\Tag.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations.Tests", "Directory\tests\FilterLists.Directory.Infrastructure.Migrations.Tests\FilterLists.Directory.Infrastructure.Migrations.Tests.csproj", "{8B07EF04-5516-40BB-B21B-CEC6F90EC631}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations.Tests", "Directory\FilterLists.Directory.Infrastructure.Migrations.Tests\FilterLists.Directory.Infrastructure.Migrations.Tests.csproj", "{8B07EF04-5516-40BB-B21B-CEC6F90EC631}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Archival", "Archival", "{5E52FEF9-9605-4ACB-8A42-A20E06331599}" EndProject diff --git a/services/FilterLists.sln.DotSettings b/services/FilterLists.sln.DotSettings index a48e85f7f..076a77a76 100644 --- a/services/FilterLists.sln.DotSettings +++ b/services/FilterLists.sln.DotSettings @@ -1,7 +1,4 @@ - + <?xml version="1.0" encoding="utf-16"?><Profile name="FilterLists Cleanup"><CSReorderTypeMembers>True</CSReorderTypeMembers><XMLReformatCode>True</XMLReformatCode><CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" /><RemoveCodeRedundanciesVB>True</RemoveCodeRedundanciesVB><Xaml.RedundantFreezeAttribute>True</Xaml.RedundantFreezeAttribute><Xaml.RemoveRedundantModifiersAttribute>True</Xaml.RemoveRedundantModifiersAttribute><Xaml.RemoveRedundantNameAttribute>True</Xaml.RemoveRedundantNameAttribute><Xaml.RemoveRedundantResource>True</Xaml.RemoveRedundantResource><Xaml.RemoveRedundantCollectionProperty>True</Xaml.RemoveRedundantCollectionProperty><Xaml.RemoveRedundantAttachedPropertySetter>True</Xaml.RemoveRedundantAttachedPropertySetter><Xaml.RemoveRedundantStyledValue>True</Xaml.RemoveRedundantStyledValue><Xaml.RemoveRedundantNamespaceAlias>True</Xaml.RemoveRedundantNamespaceAlias><Xaml.RemoveForbiddenResourceName>True</Xaml.RemoveForbiddenResourceName><Xaml.RemoveRedundantGridDefinitionsAttribute>True</Xaml.RemoveRedundantGridDefinitionsAttribute><Xaml.RemoveRedundantGridSpanAttribut>True</Xaml.RemoveRedundantGridSpanAttribut><Xaml.RemoveRedundantUpdateSourceTriggerAttribute>True</Xaml.RemoveRedundantUpdateSourceTriggerAttribute><Xaml.RemoveRedundantBindingModeAttribute>True</Xaml.RemoveRedundantBindingModeAttribute><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><RelativePathStyleTs>True</RelativePathStyleTs><AsInsteadOfCastTs>True</AsInsteadOfCastTs><CssAlphabetizeProperties>True</CssAlphabetizeProperties><JsInsertSemicolon>True</JsInsertSemicolon><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><HtmlReformatCode>True</HtmlReformatCode><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><VBOptimizeImports>True</VBOptimizeImports><VBShortenReferences>True</VBShortenReferences><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CssReformatCode>True</CssReformatCode><VBReformatCode>True</VBReformatCode><VBFormatDocComments>True</VBFormatDocComments><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments></Profile> FilterLists Cleanup NEVER @@ -10,5 +7,9 @@ CHOP_IF_LONG CHOP_IF_LONG CHOP_IF_LONG + True + True + True + True True True \ No newline at end of file diff --git a/services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs similarity index 100% rename from services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs rename to services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationBuilder.cs diff --git a/services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs similarity index 100% rename from services/SharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs rename to services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs diff --git a/services/SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj b/services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj similarity index 100% rename from services/SharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj rename to services/SharedKernel/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj diff --git a/services/SharedKernel/src/FilterLists.SharedKernel.Logging/HostRunner.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs similarity index 100% rename from services/SharedKernel/src/FilterLists.SharedKernel.Logging/HostRunner.cs rename to services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs