Skip to content

Merge develop into master #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
primo-ppcg merged 4 commits into from
Nov 7, 2025
Merged

Merge develop into master #314

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdaf6d2
Update Viewer WebApi
primo-ppcg Oct 30, 2025
59899b8
Merge branch 'master' into develop
primo-ppcg Oct 30, 2025
b058ee3
Update Dockerfile
primo-ppcg Nov 7, 2025
a4e8456
Merge pull request #313 from BinaryKits/docker
primo-ppcg Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand All @@ -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
Expand Down
Loading