From cdaf6d2503381e43a0c1cee9a4d1a769317b95ac Mon Sep 17 00:00:00 2001 From: primo-ppcg Date: Thu, 30 Oct 2025 10:25:24 +0700 Subject: [PATCH 1/2] Update Viewer WebApi Update WebApi default fonts. --- src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs | 2 +- src/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs index fb5638fb..a1a74d00 100644 --- a/src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs +++ b/src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs @@ -41,7 +41,7 @@ public class DrawerOptions private static readonly string[] fontStack0 = [ "Swis721 Cn BT", - "Nimbus Sans", + "Nimbus Sans Narrow", "Arial", "Helvetica Neue", "Roboto Condensed" diff --git a/src/Dockerfile b/src/Dockerfile index 8a4b56e2..4b004a48 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -8,7 +8,8 @@ RUN apt-get update \ libc6-dev \ libgdiplus \ libx11-dev \ - fonts-roboto \ + fonts-urw-base35 \ + fonts-dejavu \ && rm -rf /var/lib/apt/lists/* WORKDIR /app From b058ee34ef88e65beeb2443b7fc1c9785dd4f9e7 Mon Sep 17 00:00:00 2001 From: primo-ppcg Date: Fri, 7 Nov 2025 14:27:54 +0700 Subject: [PATCH 2/2] Update Dockerfile Explicitly set dotnet target OS. --- src/Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index 4b004a48..412a1396 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -2,12 +2,8 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -#Install System.Drawing native dependencies, required for NetBarcode RUN apt-get update \ && apt-get install -y --allow-unauthenticated \ - libc6-dev \ - libgdiplus \ - libx11-dev \ fonts-urw-base35 \ fonts-dejavu \ && rm -rf /var/lib/apt/lists/* @@ -24,10 +20,10 @@ COPY ["BinaryKits.Zpl.Label/BinaryKits.Zpl.Label.csproj", "BinaryKits.Zpl.Label/ RUN dotnet restore "BinaryKits.Zpl.Viewer.WebApi/BinaryKits.Zpl.Viewer.WebApi.csproj" COPY . . WORKDIR "/src/BinaryKits.Zpl.Viewer.WebApi" -RUN dotnet build "BinaryKits.Zpl.Viewer.WebApi.csproj" -c Release -o /app/build +RUN dotnet build "BinaryKits.Zpl.Viewer.WebApi.csproj" --os linux -c Release -o /app/build FROM build AS publish -RUN dotnet publish "BinaryKits.Zpl.Viewer.WebApi.csproj" -c Release -o /app/publish +RUN dotnet publish "BinaryKits.Zpl.Viewer.WebApi.csproj" --os linux -c Release -o /app/publish FROM base AS final WORKDIR /app