diff --git a/.github/workflows/robot.yml b/.github/workflows/robot.yml index 547fa466..995fc394 100644 --- a/.github/workflows/robot.yml +++ b/.github/workflows/robot.yml @@ -25,12 +25,9 @@ jobs: uses: satackey/action-docker-layer-caching@v0.0.11 continue-on-error: true - - name: Build the app - run: docker-compose build - - name: Start the service run: | - docker-compose up -d # --wait Wait is not available on gha + docker-compose up -d back postgres ingress # --wait Wait is not available on gha - name: Perform healthchecks run: | diff --git a/back/Dockerfile b/back/Dockerfile index 4655517c..3bead739 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -1,11 +1,11 @@ -# FIXME: We use the sdk 8-preview because of this issue with the 7 https://github.com/dotnet/sdk/issues/29892 -FROM mcr.microsoft.com/dotnet/sdk:8.0-preview as transcoder +FROM mcr.microsoft.com/dotnet/sdk:7.0 as transcoder RUN apt-get update && apt-get install -y cmake make libavutil-dev libavcodec-dev libavformat-dev WORKDIR /transcoder COPY src/Kyoo.Transcoder . RUN cmake . && make -j -FROM mcr.microsoft.com/dotnet/sdk:8.0-preview as builder +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 as builder +ARG TARGETARCH WORKDIR /kyoo COPY Kyoo.sln ./Kyoo.sln @@ -18,13 +18,13 @@ COPY src/Kyoo.Host/Kyoo.Host.csproj src/Kyoo.Host/Kyoo.Host.csproj COPY src/Kyoo.Postgresql/Kyoo.Postgresql.csproj src/Kyoo.Postgresql/Kyoo.Postgresql.csproj COPY src/Kyoo.Swagger/Kyoo.Swagger.csproj src/Kyoo.Swagger/Kyoo.Swagger.csproj COPY tests/Kyoo.Tests/Kyoo.Tests.csproj tests/Kyoo.Tests/Kyoo.Tests.csproj -RUN dotnet restore +RUN dotnet restore -a $TARGETARCH COPY . . ARG VERSION -RUN dotnet publish --no-restore -c Release -o /app "-p:Version=${VERSION:-"0.0.0-dev"};SkipTranscoder=true" src/Kyoo.Host +RUN dotnet publish -a $TARGETARCH --no-restore -c Release -o /app "-p:Version=${VERSION:-"0.0.0-dev"};SkipTranscoder=true" src/Kyoo.Host -FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview +FROM mcr.microsoft.com/dotnet/aspnet:7.0 RUN apt-get update && apt-get install -y libavutil-dev libavcodec-dev libavformat-dev curl COPY --from=builder /app /app COPY --from=transcoder /transcoder/libtranscoder.so /app diff --git a/back/src/Kyoo.Core/CoreModule.cs b/back/src/Kyoo.Core/CoreModule.cs index e1613c5c..4160b9a5 100644 --- a/back/src/Kyoo.Core/CoreModule.cs +++ b/back/src/Kyoo.Core/CoreModule.cs @@ -30,6 +30,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; +using Newtonsoft.Json; using JsonOptions = Kyoo.Core.Api.JsonOptions; namespace Kyoo.Core @@ -86,7 +87,10 @@ namespace Kyoo.Core { options.Filters.Add(); }) - .AddNewtonsoftJson() + .AddNewtonsoftJson(x => + { + x.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc; + }) .AddDataAnnotations() .AddControllersAsServices() .AddApiExplorer()