Skip to content

Commit 2958d95

Browse files
committed
fixing docker image
1 parent 6eefcfe commit 2958d95

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,20 @@ publish-backend:
1212
-c Release \
1313
-o artifacts/backend
1414

15+
publish-docker:
16+
dotnet publish backend/Contexture.Api/Contexture.Api.fsproj \
17+
-c Release \
18+
--os linux \
19+
-o artifacts/backend
20+
1521
build-app:
1622
cd frontend-vue && npm ci && npm run build
1723

1824
publish-app: build-app
1925
mkdir -p artifacts/frontend
2026
cp -r frontend-vue/dist/** artifacts/frontend
2127

22-
prepare-image: publish-backend publish-app
28+
prepare-image: publish-docker publish-app
2329
mkdir -p artifacts/image/wwwroot
2430
cp -r artifacts/backend/*.* artifacts/image/
2531
cp -r artifacts/frontend/** artifacts/image/wwwroot/

backend/Contexture.Api.Tests/Contexture.Api.Tests.fsproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="JsonDiffPatch.Net" Version="2.3.0" />
27-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.3" />
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
27+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.5" />
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
2929
<PackageReference Include="xunit" Version="2.4.2" />
3030
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
<PrivateAssets>all</PrivateAssets>
3333
</PackageReference>
34-
<PackageReference Include="coverlet.collector" Version="3.2.0">
34+
<PackageReference Include="coverlet.collector" Version="6.0.0">
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
<PrivateAssets>all</PrivateAssets>
3737
</PackageReference>
38-
<PackageReference Update="FSharp.Core" Version="7.0.200" />
38+
<PackageReference Update="FSharp.Core" Version="7.0.300" />
3939
<PackageReference Include="NStore.Persistence.MsSql" Version="0.14.0" />
4040
<PackageReference Include="Testcontainers" Version="2.4.0" />
4141
</ItemGroup>

backend/Contexture.Api/Contexture.Api.fsproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
<ItemGroup>
1010
<PackageReference Include="FSharp.SystemTextJson" Version="1.1.23" />
1111
<PackageReference Include="Giraffe" Version="6.0.0" />
12-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
13-
<PackageReference Include="Ply" Version="0.3.1" />
14-
<PackageReference Update="FSharp.Core" Version="7.0.200" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
13+
<PackageReference Update="FSharp.Core" Version="7.0.300" />
1514
<PackageReference Include="NStore.Persistence.MsSql" Version="0.14.0" />
16-
<PackageReference Include="FsToolkit.ErrorHandling" Version="4.4.0" />
17-
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="4.4.0" />
15+
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="4.6.0" />
16+
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
1817
</ItemGroup>
1918

2019
<ItemGroup>

backend/Contexture.Api/Properties/launchSettings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@
2222
"ASPNETCORE_ENVIRONMENT": "Development"
2323
},
2424
"applicationUrl": "http://localhost:5000"
25+
},
26+
"Contexture.Api SQL-SERVER": {
27+
"commandName": "Project",
28+
"launchBrowser": true,
29+
"environmentVariables": {
30+
"ASPNETCORE_ENVIRONMENT": "Development",
31+
"SqlBased__ConnectionString":"Server=localhost;User Id=sa;Password=development(!)Password"
32+
},
33+
"applicationUrl": "http://localhost:5000"
2534
}
2635
}
2736
}

0 commit comments

Comments
 (0)