diff --git a/ErsatzTV/Pages/_Host.cshtml b/ErsatzTV/Pages/_Host.cshtml index 743d16d50..aba7a55c7 100644 --- a/ErsatzTV/Pages/_Host.cshtml +++ b/ErsatzTV/Pages/_Host.cshtml @@ -12,7 +12,7 @@ - ErsatzTV + @if (Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyConfigurationAttribute>()?.Configuration?.ToLower() != "release") { @(System.Environment.MachineName + " ") }ErsatzTV diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor index cd9c26103..4a7855397 100644 --- a/ErsatzTV/Shared/MainLayout.razor +++ b/ErsatzTV/Shared/MainLayout.razor @@ -83,6 +83,10 @@
@if (SystemStartup.IsDatabaseReady && SystemStartup.IsSearchIndexReady) { + @if (BuildConfiguration != "release") + { + @System.Environment.MachineName + } M3U XMLTV API @@ -210,6 +214,10 @@ ErsatzTV Version @InfoVersion + @if (BuildConfiguration != "release") + { + @BuildConfiguration + } @@ -221,6 +229,7 @@ @code { private static readonly string InfoVersion = Assembly.GetEntryAssembly().GetCustomAttribute()?.InformationalVersion ?? "unknown"; + private static readonly string BuildConfiguration = Assembly.GetEntryAssembly().GetCustomAttribute()?.Configuration?.ToLower() ?? "unset"; private CancellationTokenSource _cts; diff --git a/docker/Dockerfile b/docker/Dockerfile index 350e9c2d1..05021ded1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,11 +40,12 @@ COPY ErsatzTV.Infrastructure.Sqlite/. ./ErsatzTV.Infrastructure.Sqlite/ COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/ COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/ ARG INFO_VERSION="unknown" +ARG BUILD_CONFIG="release" WORKDIR /source/ErsatzTV.Scanner -RUN dotnet publish ErsatzTV.Scanner.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} +RUN dotnet publish ErsatzTV.Scanner.csproj -c ${BUILD_CONFIG} -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} WORKDIR /source/ErsatzTV RUN sed -i '/Scanner/d' ErsatzTV.csproj -RUN dotnet publish ErsatzTV.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} +RUN dotnet publish ErsatzTV.csproj -c ${BUILD_CONFIG} -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} # final stage/image FROM runtime-base diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile index 10cadddb9..4624fcf24 100644 --- a/docker/arm32v7/Dockerfile +++ b/docker/arm32v7/Dockerfile @@ -32,10 +32,11 @@ COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/ COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/ WORKDIR /source/ErsatzTV.Scanner ARG INFO_VERSION="unknown" -RUN dotnet publish ErsatzTV.Scanner.csproj --framework net9.0 -c release -o /app --runtime linux-arm --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} +ARG BUILD_CONFIG="release" +RUN dotnet publish ErsatzTV.Scanner.csproj --framework net9.0 -c ${BUILD_CONFIG} -o /app --runtime linux-arm --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} WORKDIR /source/ErsatzTV RUN sed -i '/Scanner/d' ErsatzTV.csproj -RUN dotnet publish ErsatzTV.csproj --framework net9.0 -c release -o /app --runtime linux-arm --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} +RUN dotnet publish ErsatzTV.csproj --framework net9.0 -c ${BUILD_CONFIG} -o /app --runtime linux-arm --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} # final stage/image FROM runtime-base diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index da4de699e..8fcb0bb46 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -32,10 +32,11 @@ COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/ COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/ WORKDIR /source/ErsatzTV.Scanner ARG INFO_VERSION="unknown" -RUN dotnet publish ErsatzTV.Scanner.csproj --framework net9.0 -c release -o /app --runtime linux-arm64 --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} +ARG BUILD_CONFIG="release" +RUN dotnet publish ErsatzTV.Scanner.csproj --framework net9.0 -c ${BUILD_CONFIG} -o /app --runtime linux-arm64 --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} WORKDIR /source/ErsatzTV RUN sed -i '/Scanner/d' ErsatzTV.csproj -RUN dotnet publish ErsatzTV.csproj --framework net9.0 -c release -o /app --runtime linux-arm64 --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} +RUN dotnet publish ErsatzTV.csproj --framework net9.0 -c ${BUILD_CONFIG} -o /app --runtime linux-arm64 --no-self-contained --no-restore -p:DebugType=Embedded -p:PublishSingleFile=false -p:PublishTrimmed=false -p:InformationalVersion=${INFO_VERSION} # final stage/image FROM runtime-base