From 71e0514bfe406456a18b08ed44efaee9b83238b0 Mon Sep 17 00:00:00 2001 From: Aytac Kirmizi Date: Tue, 5 Mar 2024 09:37:47 +0100 Subject: [PATCH] **Update** docker file --- Dockerfile_Linkding | 4 ++-- Dockerfile_Wallabag | 4 ++-- Linkding.Sync.sln | 8 ++++++++ src/Services/Wallabag.Client/Wallabag.Client.csproj | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile_Linkding b/Dockerfile_Linkding index 8e2fb1d..e654a00 100644 --- a/Dockerfile_Linkding +++ b/Dockerfile_Linkding @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base +FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["src/Linkding/Linkding.csproj", "src/Linkding/"] RUN dotnet restore "src/Linkding/Linkding.csproj" diff --git a/Dockerfile_Wallabag b/Dockerfile_Wallabag index feb9b80..a78e15d 100644 --- a/Dockerfile_Wallabag +++ b/Dockerfile_Wallabag @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base +FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["src/Wallabag/Wallabag.csproj", "src/Wallabag/"] RUN dotnet restore "src/Wallabag/Wallabag.csproj" diff --git a/Linkding.Sync.sln b/Linkding.Sync.sln index ef25416..d43bcd2 100644 --- a/Linkding.Sync.sln +++ b/Linkding.Sync.sln @@ -21,6 +21,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wallabag", "src\Wallabag\Wa EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linkding", "src\Linkding\Linkding.csproj", "{3E78F171-D237-46DF-8A27-DAADE7CA1940}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Items", "Items", "{328C408E-A1CD-4CDC-B13D-A4EC2F8C8494}" + ProjectSection(SolutionItems) = preProject + .dockerignore = .dockerignore + .gitignore = .gitignore + Dockerfile_Linkding = Dockerfile_Linkding + Dockerfile_Wallabag = Dockerfile_Wallabag + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/Services/Wallabag.Client/Wallabag.Client.csproj b/src/Services/Wallabag.Client/Wallabag.Client.csproj index 7b7326e..4a2236e 100644 --- a/src/Services/Wallabag.Client/Wallabag.Client.csproj +++ b/src/Services/Wallabag.Client/Wallabag.Client.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + AnyCPU