diff --git a/back/Dockerfile b/back/Dockerfile index 9c88a9b3..c4c5935a 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -1,4 +1,4 @@ -FROM gcc:latest as transcoder +FROM mcr.microsoft.com/dotnet/sdk:6.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 . diff --git a/back/Dockerfile.dev b/back/Dockerfile.dev index a0aac4ec..34882c9f 100644 --- a/back/Dockerfile.dev +++ b/back/Dockerfile.dev @@ -1,5 +1,6 @@ -FROM gcc:latest as transcoder -RUN apt-get update && apt-get install -y cmake make libavutil-dev libavcodec-dev libavformat-dev +FROM mcr.microsoft.com/dotnet/sdk:6.0 as transcoder +# Using the dotnet sdk as a base image to have the same versions of glibc/ffmpeg +RUN apt-get update && apt-get install -y gcc cmake make libavutil-dev libavcodec-dev libavformat-dev WORKDIR /transcoder COPY src/Kyoo.Transcoder . RUN cmake . && make -j @@ -20,11 +21,12 @@ 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 -COPY --from=transcoder /transcoder/libtranscoder.so /app/out/bin/Kyoo.Host/Debug/net6.0/libtranscoder.so +COPY --from=transcoder /transcoder/libtranscoder.so /lib/libtranscoder.so WORKDIR /kyoo EXPOSE 5000 ENV DOTNET_USE_POLLING_FILE_WATCHER 1 HEALTHCHECK --interval=5s CMD curl --fail http://localhost:5000/health || exit +# ENV LD_DEBUG libs CMD dotnet watch run --no-restore --project /app/src/Kyoo.Host diff --git a/back/src/Kyoo.Transcoder/tests/test_main.c b/back/src/Kyoo.Transcoder/tests/test_main.c index 653c3015..fba69376 100644 --- a/back/src/Kyoo.Transcoder/tests/test_main.c +++ b/back/src/Kyoo.Transcoder/tests/test_main.c @@ -69,4 +69,4 @@ int main(int argc, char **argv) %s info video_path - Test info prober\n\ %s transmux video_path m3u8_output_file - Test transmuxing\n", argv[0], argv[0]); return 0; -} \ No newline at end of file +}