From b5ef826400a8995547e0dc2727cb0e3a20a0f37a Mon Sep 17 00:00:00 2001 From: Martijn Storck Date: Thu, 13 Nov 2025 13:31:32 +0100 Subject: [PATCH] Fix build by using Debian images; finish .NET 10 upgrade --- Dockerfile | 17 ++++++++--------- PointingParty/Components/App.razor | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0533aab..eb20622 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,22 @@ ARG DOTNET_VERSION=10.0 -FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS build +RUN apt-get update && apt-get install -y python3 curl && rm -rf /var/lib/apt/lists/* RUN dotnet workload install wasm-tools WORKDIR /src # tailwind install RUN set -ex; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - aarch64) arch='linux-arm64' ;; \ - x86_64) arch='linux-x64' ;; \ + arch="$(dpkg --print-architecture)"; \ + case "$arch" in \ + arm64) arch='linux-arm64' ;; \ + amd64) arch='linux-x64' ;; \ esac; \ - echo Downloading tailwindcss for $apkArch ; \ + echo Downloading tailwindcss for $arch ; \ curl -sL -o tailwindcss https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/tailwindcss-$arch; \ chmod +x tailwindcss; \ ls -al tailwindcss ; -RUN apk add python3 - # restore COPY *.sln . COPY PointingParty/PointingParty.csproj PointingParty/PointingParty.csproj @@ -37,7 +36,7 @@ RUN set -ex; \ RUN dotnet publish --no-restore -c Release -o /app PointingParty # final stage/image -FROM mcr.microsoft.com/dotnet/aspnet:${DOTNET_VERSION}-alpine +FROM mcr.microsoft.com/dotnet/aspnet:${DOTNET_VERSION} ENV ASPNETCORE_URLS=http://+:8080 ENV ASPNETCORE_ENVIRONMENT=Production EXPOSE 8080 diff --git a/PointingParty/Components/App.razor b/PointingParty/Components/App.razor index 809a312..dc64efa 100644 --- a/PointingParty/Components/App.razor +++ b/PointingParty/Components/App.razor @@ -15,7 +15,7 @@ - +