Dockerfile: Fixing the cmd

This commit is contained in:
Zoe Roux 2021-10-24 19:02:25 +02:00
parent f4ba5c578d
commit affca0f333
3 changed files with 25 additions and 1 deletions

View File

@ -21,5 +21,5 @@ EXPOSE 5000
COPY --from=builder /opt/kyoo /usr/lib/kyoo COPY --from=builder /opt/kyoo /usr/lib/kyoo
COPY --from=transcoder /transcoder/libtranscoder.so /usr/lib/kyoo COPY --from=transcoder /transcoder/libtranscoder.so /usr/lib/kyoo
COPY --from=webapp /webapp/Front/dist/* /usr/lib/kyoo/wwwroot/ COPY --from=webapp /webapp/Front/dist/* /usr/lib/kyoo/wwwroot/
CMD ["/usr/lib/kyoo/Kyoo", "/var/lib/kyoo"] CMD ["/usr/lib/kyoo/Kyoo.Host.Console"]

View File

@ -22,6 +22,9 @@ using Kyoo.Core;
namespace Kyoo.Host.WindowsTrait namespace Kyoo.Host.WindowsTrait
{ {
/// <summary>
/// Windows's program entrypoint.
/// </summary>
public static class Program public static class Program
{ {
/// <summary> /// <summary>

View File

@ -19,11 +19,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using Kyoo.Abstractions;
using Kyoo.Abstractions.Controllers; using Kyoo.Abstractions.Controllers;
using Kyoo.Abstractions.Models.Permissions; using Kyoo.Abstractions.Models.Permissions;
using Kyoo.Abstractions.Models.Utils; using Kyoo.Abstractions.Models.Utils;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ApplicationModels;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using NJsonSchema; using NJsonSchema;
using NJsonSchema.Generation.TypeMappers; using NJsonSchema.Generation.TypeMappers;
@ -50,6 +52,20 @@ namespace Kyoo.Swagger
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, Type> Configuration => new(); public Dictionary<string, Type> Configuration => new();
/// <summary>
/// The configuration instance used to retrieve the server's public url.
/// </summary>
private readonly IConfiguration _configuration;
/// <summary>
/// Create a new <see cref="SwaggerModule"/>.
/// </summary>
/// <param name="configuration">The configuration instance used to retrieve the server's public url.</param>
public SwaggerModule(IConfiguration configuration)
{
_configuration = configuration;
}
/// <inheritdoc /> /// <inheritdoc />
public void Configure(IServiceCollection services) public void Configure(IServiceCollection services)
{ {
@ -75,6 +91,11 @@ namespace Kyoo.Swagger
Name = "GPL-3.0-or-later", Name = "GPL-3.0-or-later",
Url = "https://github.com/AnonymusRaccoon/Kyoo/blob/master/LICENSE" Url = "https://github.com/AnonymusRaccoon/Kyoo/blob/master/LICENSE"
}; };
options.Servers.Add(new OpenApiServer
{
Url = _configuration.GetPublicUrl().ToString(),
Description = "The currently running kyoo's instance."
});
options.Info.ExtensionData ??= new Dictionary<string, object>(); options.Info.ExtensionData ??= new Dictionary<string, object>();
options.Info.ExtensionData["x-logo"] = new options.Info.ExtensionData["x-logo"] = new