Fixed docker file

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
 
 build:
   stage: build
-  image: mcr.microsoft.com/dotnet/sdk:9.0
+  image: mcr.microsoft.com/dotnet/sdk:10.0
   script:
     - dotnet restore
     - dotnet build --configuration Release --no-restore
@@ -19,7 +19,7 @@ build:
 
 test:
   stage: test
-  image: mcr.microsoft.com/dotnet/sdk:9.0
+  image: mcr.microsoft.com/dotnet/sdk:10.0
   script:
     - dotnet test --verbosity normal
   dependencies:
@@ -27,13 +27,13 @@ test:
 
 publish:
   stage: publish
-  image: docker:latest
+  tags:
-  services:
+    - docker
-    - name: docker:dind
+  before_script:
-      alias: docker
+    - git lfs pull
   script:
     - export VERSION=$(echo $CI_COMMIT_TAG | sed 's/^v//')
-    - docker login -u leon.hoppe -p ${CI_REGISTRY_PASSWORD} registry.leon-hoppe.de
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin registry.leon-hoppe.de
     - docker build -t $DOCKER_IMAGE/api:$VERSION -t $DOCKER_IMAGE/api:latest -f src/Portfolio.Api/Dockerfile .
     - docker build -t $DOCKER_IMAGE/web:$VERSION -t $DOCKER_IMAGE/web:latest -f src/Portfolio.Web/Dockerfile .
     - docker push $DOCKER_IMAGE/api:$VERSION

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "10.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
+}

src/Portfolio.Api/Portfolio.Api.csproj

@@ -8,10 +8,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
+        <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.0.2" />
-        <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.0.0" />
+        <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="13.0.2" />
-        <PackageReference Include="HopFrame.Web" Version="3.1.0" />
+        <PackageReference Include="HopFrame.Web" Version="3.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
     </ItemGroup>
 
     <ItemGroup>

src/Portfolio.Api/Program.cs

@@ -1,4 +1,3 @@
-using HopFrame.Core.Config;
 using HopFrame.Web;
 using Portfolio.Api;
 using Portfolio.Api.Services;
@@ -31,25 +30,8 @@ builder.Services.AddHopFrame(options => {
     options.DisplayUserInfo(false);
     options.AddDbContext<DatabaseContext>(context => {
         context.Table<Project>(table => {
-            var langConfig = table.InnerConfig.Properties
-                .Single(prop => prop.Name == nameof(Project.Languages));
-
-            langConfig
-                .GetType()!
-                .GetProperty(nameof(PropertyConfig.IsRelation))!
-                .SetValue(langConfig, true);
-            
-            langConfig
-                .GetType()!
-                .GetProperty(nameof(PropertyConfig.IsEnumerable))!
-                .SetValue(langConfig, true);
-            
-            langConfig
-                .GetType()!
-                .GetProperty(nameof(PropertyConfig.IsRequired))!
-                .SetValue(langConfig, true);
-
             table.Property(p => p.Languages)
+                .ForceRelation(isEnumerable: true)
                 .FormatEach<Technology>((l, _) => l.Name)
                 .List(false);
 

src/Portfolio.Api/Services/ProjectRepository.cs

@@ -9,6 +9,7 @@ internal sealed class ProjectRepository(DatabaseContext context) : IProjectRepos
     public async Task<IEnumerable<Project>> GetProjects(CancellationToken ct) {
         return await context.Projects
             .Include(p => p.Languages)
+            .OrderByDescending(p => p.OrderIndex)
             .ToArrayAsync(ct);
     }
     

src/Portfolio.Host/Portfolio.Host.csproj

@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAspireHost>true</IsAspireHost>
@@ -12,9 +12,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0"/>
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.2" />
-        <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
+        <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.0.2" />
-        <PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
+        <PackageReference Include="Aspire.Hosting.Redis" Version="13.0.2" />
     </ItemGroup>
 
     <ItemGroup>

src/Portfolio.Shared/Portfolio.Shared.csproj

@@ -10,13 +10,13 @@
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App"/>
 
-        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
-        <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0"/>
+        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
     </ItemGroup>
 
 </Project>

src/Portfolio.Web/Dockerfile

@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 

src/Portfolio.Web/Portfolio.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>