diff --git a/src/FilterLists.Agent/FilterLists.Agent.csproj b/src/FilterLists.Agent/FilterLists.Agent.csproj
index c3a334efc..57e217a94 100644
--- a/src/FilterLists.Agent/FilterLists.Agent.csproj
+++ b/src/FilterLists.Agent/FilterLists.Agent.csproj
@@ -7,9 +7,9 @@
netcoreapp2.2
true
linux-musl-x64
- false
--additionalProbingPath /root/.nuget/fallbackpackages2 --additionalProbingPath /root/.nuget/fallbackpackages "bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).dll" -a -v
/usr/bin/dotnet
+ ..\..\docker-compose.dcproj
diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index e3afc8884..a3b916d6e 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -2,9 +2,9 @@
# Command: docker build -f src/FilterLists.Api/Dockerfile .
# init base
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine as base
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:2.2-alpine as base
EXPOSE 80
-ENTRYPOINT ["dotnet", "FilterLists.Api.dll"]
+ENTRYPOINT ["./FilterLists.Api"]
COPY data/. data/
WORKDIR /app
@@ -25,7 +25,7 @@ COPY src/FilterLists.Data/. FilterLists.Data/
COPY src/FilterLists.Services/. FilterLists.Services/
WORKDIR /app/src/FilterLists.Api
COPY src/FilterLists.Api/. .
-RUN dotnet build -c Release --no-restore
+RUN dotnet build -c Release -r linux-musl-x64 --no-restore
# init Data.Tests
FROM build AS test-data
@@ -56,7 +56,7 @@ RUN dotnet build -c Release --no-restore
# publish
FROM build AS publish
-RUN dotnet publish -c Release -o out --no-restore --no-build
+RUN dotnet publish -c Release -r linux-musl-x64 -o out --no-restore --no-build
# final
FROM base as final
diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj
index 2c8ff2e3d..616a03fbd 100644
--- a/src/FilterLists.Api/FilterLists.Api.csproj
+++ b/src/FilterLists.Api/FilterLists.Api.csproj
@@ -1,25 +1,24 @@
- netcoreapp2.2
- InProcess
- true
latest
- /subscriptions/4bcbdfe1-6c65-4c02-820f-7c0e7ec5614f/resourcegroups/FilterLists/providers/microsoft.insights/components/FilterLists
- /subscriptions/4bcbdfe1-6c65-4c02-820f-7c0e7ec5614f/resourcegroups/FilterLists/providers/microsoft.insights/components/FilterLists
+ netcoreapp2.2
+ true
+ linux-musl-x64
+ ..\..\docker-compose.dcproj
+
+
+
Collin M. Barrett
Collin M. Barrett
FilterLists
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
Copyright (c) 2019 Collin M. Barrett
https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
- https://filterlists.com/
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
- git
https://github.com/collinbarrett/FilterLists
- false
- Exe
- ..\..\docker-compose.dcproj
+ git
+ https://filterlists.com/
@@ -30,11 +29,19 @@
FilterLists.Api.ruleset
+
+
+
+
+
+
+
+
@@ -45,8 +52,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/FilterLists.Data/FilterLists.Data.csproj b/src/FilterLists.Data/FilterLists.Data.csproj
index f4dda9fed..1bbfd2aa3 100644
--- a/src/FilterLists.Data/FilterLists.Data.csproj
+++ b/src/FilterLists.Data/FilterLists.Data.csproj
@@ -1,21 +1,28 @@
+ latest
netstandard2.0
true
- latest
+
+
+
Collin M. Barrett
+ Collin M. Barrett
FilterLists
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
Copyright (c) 2019 Collin M. Barrett
https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
- https://filterlists.com/
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
https://github.com/collinbarrett/FilterLists
git
- false
+ https://filterlists.com/
+
+
+
+
diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj
index 2752ff5a8..4fd0c8725 100644
--- a/src/FilterLists.Services/FilterLists.Services.csproj
+++ b/src/FilterLists.Services/FilterLists.Services.csproj
@@ -1,21 +1,32 @@
+ latest
netstandard2.0
true
- latest
+
+
+
Collin M. Barrett
+ Collin M. Barrett
FilterLists
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
Copyright (c) 2019 Collin M. Barrett
https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
- https://filterlists.com/
- git
https://github.com/collinbarrett/FilterLists
- false
+ git
+ https://filterlists.com/
+
+
+
+
+
+
+
+
@@ -26,8 +37,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile
index dabb9bf9a..f2278d5a7 100644
--- a/src/FilterLists.Web/Dockerfile
+++ b/src/FilterLists.Web/Dockerfile
@@ -2,10 +2,10 @@
# Command: docker build -f src/FilterLists.Web/Dockerfile .
# init base
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine as runtime
-WORKDIR /app
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:2.2-alpine as base
EXPOSE 80
-ENTRYPOINT ["dotnet", "FilterLists.Web.dll"]
+ENTRYPOINT ["./FilterLists.Web"]
+WORKDIR /app
# init build
FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build
@@ -22,8 +22,8 @@ RUN dotnet restore
# publish
WORKDIR /app/src/FilterLists.Web/
COPY src/FilterLists.Web/. ./
-RUN dotnet publish -c Release -o out --no-restore
+RUN dotnet publish -c Release -r linux-musl-x64 -o out --no-restore
# run
-FROM runtime as final
+FROM base as final
COPY --from=build /app/src/FilterLists.Web/out ./
diff --git a/src/FilterLists.Web/FilterLists.Web.csproj b/src/FilterLists.Web/FilterLists.Web.csproj
index 93c8c9090..6f3833bbc 100644
--- a/src/FilterLists.Web/FilterLists.Web.csproj
+++ b/src/FilterLists.Web/FilterLists.Web.csproj
@@ -1,27 +1,32 @@
- netcoreapp2.2
- InProcess
- true
latest
- true
+ netcoreapp2.2
+ true
+ linux-musl-x64
+ ..\..\docker-compose.dcproj
Latest
- false
+ true
+
+
+
Collin M. Barrett
+ Collin M. Barrett
FilterLists
- https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
- Copyright (c) 2019 Collin M. Barrett
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
- https://filterlists.com/
+ Copyright (c) 2019 Collin M. Barrett
+ https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
https://github.com/collinbarrett/FilterLists
git
- true
- false
- ..\..\docker-compose.dcproj
+ https://filterlists.com/
+
+
+
+
@@ -47,7 +52,8 @@
-
+
diff --git a/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj b/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
index 28c670c71..07daec9f4 100644
--- a/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
+++ b/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
@@ -1,20 +1,23 @@
- netcoreapp2.2
- true
8.0
enable
+ netcoreapp2.2
+ true
+
+
+
Collin M. Barrett
Collin M. Barrett
FilterLists
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
Copyright (c) 2019 Collin M. Barrett
https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
- https://filterlists.com/
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
- git
https://github.com/collinbarrett/FilterLists
+ git
+ https://filterlists.com/
@@ -25,6 +28,10 @@
FilterLists.Agent.Tests.ruleset
+
+
+
+
@@ -43,8 +50,4 @@
-
-
-
-
-
+
\ No newline at end of file
diff --git a/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
index 14f82f019..9d4754308 100644
--- a/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
+++ b/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
@@ -1,19 +1,22 @@
+ latest
netcoreapp2.2
true
- latest
+
+
+
Collin M. Barrett
Collin M. Barrett
FilterLists
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
Copyright (c) 2019 Collin M. Barrett
https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
- https://filterlists.com/
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
- git
https://github.com/collinbarrett/FilterLists
+ git
+ https://filterlists.com/
@@ -46,4 +49,4 @@
-
+
\ No newline at end of file
diff --git a/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
index c2a389b00..b4470a520 100644
--- a/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
+++ b/tests/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
@@ -1,19 +1,22 @@
+ latest
netcoreapp2.2
true
- latest
+
+
+
Collin M. Barrett
Collin M. Barrett
FilterLists
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
Copyright (c) 2019 Collin M. Barrett
https://github.com/collinbarrett/FilterLists/blob/master/LICENSE
- https://filterlists.com/
https://github.com/collinbarrett/FilterLists/raw/master/imgs/icon_filterlists.png
- git
https://github.com/collinbarrett/FilterLists
+ git
+ https://filterlists.com/
@@ -24,6 +27,10 @@
FilterLists.Services.Tests.ruleset
+
+
+
+
@@ -38,8 +45,4 @@
-
-
-
-
-
+
\ No newline at end of file