diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7f89ebd2d..7abed2564 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,25 +7,25 @@ updates: time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: docker - directory: "/services/archival/src/FilterLists.Archival.Api" + directory: "/services/Archival/src/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/src/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/src/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/src/FilterLists.Archival.Infrastructure" schedule: interval: daily time: "11:00" diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 70fa4b626..ae346406b 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -13,7 +13,7 @@ services: archival-api: build: context: ./services - dockerfile: archival/src/FilterLists.Archival.Api/Dockerfile.dev + dockerfile: Archival/src/FilterLists.Archival.Api/Dockerfile.dev environment: - ASPNETCORE_ENVIRONMENT=Development diff --git a/docker-compose.prod.build.yml b/docker-compose.prod.build.yml index 467eefe84..ec1e8cb97 100644 --- a/docker-compose.prod.build.yml +++ b/docker-compose.prod.build.yml @@ -7,7 +7,7 @@ services: archival-api: build: context: ./services - dockerfile: archival/src/FilterLists.Archival.Api/Dockerfile + dockerfile: Archival/src/FilterLists.Archival.Api/Dockerfile directory-api: build: diff --git a/services/archival/src/FilterLists.Archival.Api/Dockerfile b/services/Archival/src/FilterLists.Archival.Api/Dockerfile similarity index 59% rename from services/archival/src/FilterLists.Archival.Api/Dockerfile rename to services/Archival/src/FilterLists.Archival.Api/Dockerfile index ea8cb2885..c07d9b693 100644 --- a/services/archival/src/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/src/FilterLists.Archival.Api/Dockerfile @@ -8,19 +8,19 @@ 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 . +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/. . +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 diff --git a/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev b/services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev similarity index 57% rename from services/archival/src/FilterLists.Archival.Api/Dockerfile.dev rename to services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev index 75f65e6a9..28e4e5d07 100644 --- a/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev +++ b/services/Archival/src/FilterLists.Archival.Api/Dockerfile.dev @@ -8,19 +8,19 @@ 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 . +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/. . +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 diff --git a/services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj b/services/Archival/src/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/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj diff --git a/services/archival/src/FilterLists.Archival.Api/Program.cs b/services/Archival/src/FilterLists.Archival.Api/Program.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Api/Program.cs rename to services/Archival/src/FilterLists.Archival.Api/Program.cs diff --git a/services/archival/src/FilterLists.Archival.Api/Properties/launchSettings.json b/services/Archival/src/FilterLists.Archival.Api/Properties/launchSettings.json similarity index 100% rename from services/archival/src/FilterLists.Archival.Api/Properties/launchSettings.json rename to services/Archival/src/FilterLists.Archival.Api/Properties/launchSettings.json diff --git a/services/archival/src/FilterLists.Archival.Api/Startup.cs b/services/Archival/src/FilterLists.Archival.Api/Startup.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Api/Startup.cs rename to services/Archival/src/FilterLists.Archival.Api/Startup.cs diff --git a/services/archival/src/FilterLists.Archival.Application/ConfigurationExtensions.cs b/services/Archival/src/FilterLists.Archival.Application/ConfigurationExtensions.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Application/ConfigurationExtensions.cs rename to services/Archival/src/FilterLists.Archival.Application/ConfigurationExtensions.cs diff --git a/services/archival/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj b/services/Archival/src/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/src/FilterLists.Archival.Application/FilterLists.Archival.Application.csproj diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs b/services/Archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs rename to services/Archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj b/services/Archival/src/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/src/FilterLists.Archival.Infrastructure/FilterLists.Archival.Infrastructure.csproj diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/Options/GitOptions.cs b/services/Archival/src/FilterLists.Archival.Infrastructure/Options/GitOptions.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Infrastructure/Options/GitOptions.cs rename to services/Archival/src/FilterLists.Archival.Infrastructure/Options/GitOptions.cs diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs b/services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs rename to services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs b/services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs rename to services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/GitFileArchiver.cs diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs b/services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs rename to services/Archival/src/FilterLists.Archival.Infrastructure/Persistence/IArchiveFile.cs diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs b/services/Archival/src/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs similarity index 100% rename from services/archival/src/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs rename to services/Archival/src/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs diff --git a/services/FilterLists.sln b/services/FilterLists.sln index e76da869a..8b96ab8d3 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -52,11 +52,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Archival", "Archival", "{5E52FEF9-9605-4ACB-8A42-A20E06331599}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Api", "archival\src\FilterLists.Archival.Api\FilterLists.Archival.Api.csproj", "{F625C241-0501-4AEB-8B82-609C93EE6B7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Api", "Archival\src\FilterLists.Archival.Api\FilterLists.Archival.Api.csproj", "{F625C241-0501-4AEB-8B82-609C93EE6B7D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Application", "archival\src\FilterLists.Archival.Application\FilterLists.Archival.Application.csproj", "{11669839-E666-477B-A1B6-276041AD3768}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Application", "Archival\src\FilterLists.Archival.Application\FilterLists.Archival.Application.csproj", "{11669839-E666-477B-A1B6-276041AD3768}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Infrastructure", "archival\src\FilterLists.Archival.Infrastructure\FilterLists.Archival.Infrastructure.csproj", "{A0B77015-E8C4-41D3-B63D-BF818026298C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Infrastructure", "Archival\src\FilterLists.Archival.Infrastructure\FilterLists.Archival.Infrastructure.csproj", "{A0B77015-E8C4-41D3-B63D-BF818026298C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedKernel", "SharedKernel", "{59197818-6C72-4A3C-A595-49F3D7D2EB18}" EndProject