fixing docker image

trustbit · Jun 4, 2023 · 2958d95 · 2958d95
1 parent 6eefcfe
commit 2958d95
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -12,14 +12,20 @@ publish-backend:
         -c Release \
         -o artifacts/backend
 
+publish-docker:
+	dotnet publish backend/Contexture.Api/Contexture.Api.fsproj \
+        -c Release \
+        --os linux \
+        -o artifacts/backend
+
 build-app:
 	cd frontend-vue && npm ci && npm run build
 
 publish-app: build-app
 	mkdir -p artifacts/frontend
 	cp -r frontend-vue/dist/** artifacts/frontend
 
-prepare-image: publish-backend publish-app
+prepare-image: publish-docker publish-app
 	mkdir -p artifacts/image/wwwroot
 	cp -r artifacts/backend/*.* artifacts/image/
 	cp -r artifacts/frontend/** artifacts/image/wwwroot/

diff --git a/backend/Contexture.Api.Tests/Contexture.Api.Tests.fsproj b/backend/Contexture.Api.Tests/Contexture.Api.Tests.fsproj
@@ -24,18 +24,18 @@
 
     <ItemGroup>
         <PackageReference Include="JsonDiffPatch.Net" Version="2.3.0" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.5" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.2.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Update="FSharp.Core" Version="7.0.200" />
+        <PackageReference Update="FSharp.Core" Version="7.0.300" />
         <PackageReference Include="NStore.Persistence.MsSql" Version="0.14.0" />
         <PackageReference Include="Testcontainers" Version="2.4.0" />
     </ItemGroup>

diff --git a/backend/Contexture.Api/Contexture.Api.fsproj b/backend/Contexture.Api/Contexture.Api.fsproj
@@ -9,12 +9,11 @@
   <ItemGroup>
     <PackageReference Include="FSharp.SystemTextJson" Version="1.1.23" />
     <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Ply" Version="0.3.1" />
-    <PackageReference Update="FSharp.Core" Version="7.0.200" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
     <PackageReference Include="NStore.Persistence.MsSql" Version="0.14.0" />
-    <PackageReference Include="FsToolkit.ErrorHandling" Version="4.4.0" />
-    <PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="4.4.0" />
+    <PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="4.6.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5"  />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/backend/Contexture.Api/Properties/launchSettings.json b/backend/Contexture.Api/Properties/launchSettings.json
@@ -22,6 +22,15 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:5000"
+    },
+    "Contexture.Api SQL-SERVER": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "SqlBased__ConnectionString":"Server=localhost;User Id=sa;Password=development(!)Password"
+      },
+      "applicationUrl": "http://localhost:5000"
     }
   }
 }