From 78ff0bb6c52d2d9ff3619cb055bc82fd211ccb5c Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Sat, 31 Jan 2026 19:02:44 +0100 Subject: [PATCH] Update Docker builds to correct target architecture is used to prevent problems with arm64 (#1563) --- apps/server/AliasVault.Admin/Dockerfile | 2 +- apps/server/AliasVault.Api/Dockerfile | 2 +- apps/server/AliasVault.Client/Dockerfile | 2 +- apps/server/Services/AliasVault.SmtpService/Dockerfile | 2 +- apps/server/Services/AliasVault.TaskRunner/Dockerfile | 2 +- apps/server/Utilities/AliasVault.InstallCli/Dockerfile | 2 +- dockerfiles/all-in-one/Dockerfile | 4 +--- docs/docker-compose.dev.yml | 4 ++-- docs/docker-compose.yml | 4 ++-- docs/installation/docker-compose/index.md | 2 +- docs/installation/script/update/v0.22.0.md | 6 +++--- docs/installation/script/update/v0.23.0.md | 6 +++--- 12 files changed, 18 insertions(+), 20 deletions(-) diff --git a/apps/server/AliasVault.Admin/Dockerfile b/apps/server/AliasVault.Admin/Dockerfile index db2fd9f08..44c6d4e21 100644 --- a/apps/server/AliasVault.Admin/Dockerfile +++ b/apps/server/AliasVault.Admin/Dockerfile @@ -2,7 +2,7 @@ WORKDIR /app EXPOSE 3002 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/apps/server/AliasVault.Api/Dockerfile b/apps/server/AliasVault.Api/Dockerfile index 194f847d1..61235335b 100644 --- a/apps/server/AliasVault.Api/Dockerfile +++ b/apps/server/AliasVault.Api/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/apps/server/AliasVault.Client/Dockerfile b/apps/server/AliasVault.Client/Dockerfile index e1837db76..c384c5fa1 100644 --- a/apps/server/AliasVault.Client/Dockerfile +++ b/apps/server/AliasVault.Client/Dockerfile @@ -31,7 +31,7 @@ RUN cd ./core && \ # ============================================ # Stage: Build .NET application # ============================================ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH ARG BUILD_CONFIGURATION=Release ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/apps/server/Services/AliasVault.SmtpService/Dockerfile b/apps/server/Services/AliasVault.SmtpService/Dockerfile index df5e90e2b..c67bdc84d 100644 --- a/apps/server/Services/AliasVault.SmtpService/Dockerfile +++ b/apps/server/Services/AliasVault.SmtpService/Dockerfile @@ -1,7 +1,7 @@ FROM mcr.microsoft.com/dotnet/runtime:9.0 AS base WORKDIR /app -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/apps/server/Services/AliasVault.TaskRunner/Dockerfile b/apps/server/Services/AliasVault.TaskRunner/Dockerfile index f5c53c756..9f4f439b5 100644 --- a/apps/server/Services/AliasVault.TaskRunner/Dockerfile +++ b/apps/server/Services/AliasVault.TaskRunner/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/apps/server/Utilities/AliasVault.InstallCli/Dockerfile b/apps/server/Utilities/AliasVault.InstallCli/Dockerfile index 52e71dcc2..66fcb3321 100644 --- a/apps/server/Utilities/AliasVault.InstallCli/Dockerfile +++ b/apps/server/Utilities/AliasVault.InstallCli/Dockerfile @@ -1,7 +1,7 @@ FROM mcr.microsoft.com/dotnet/runtime:9.0 AS base WORKDIR /app -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG TARGETARCH ARG BUILD_CONFIGURATION=Release WORKDIR /apps/server diff --git a/dockerfiles/all-in-one/Dockerfile b/dockerfiles/all-in-one/Dockerfile index 36c7f8421..8a173613c 100644 --- a/dockerfiles/all-in-one/Dockerfile +++ b/dockerfiles/all-in-one/Dockerfile @@ -30,9 +30,7 @@ RUN cd ./core && \ # ============================================ # Stage 2: Build .NET applications # ============================================ -# Use BUILDPLATFORM for .NET build - the published output is architecture-independent -# (Blazor WASM runs in browser, server components use IL that runs anywhere) -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS dotnet-builder +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS dotnet-builder # Install Python (required for WASM compilation) and Node.js (required by JS bundler) RUN apt-get update && \ diff --git a/docs/docker-compose.dev.yml b/docs/docker-compose.dev.yml index 8e2691e1a..bdc542778 100644 --- a/docs/docker-compose.dev.yml +++ b/docs/docker-compose.dev.yml @@ -4,8 +4,8 @@ # with livereload enabled. # # Usage: -# docker-compose up -d -# docker-compose down +# docker compose up -d +# docker compose down # services: jekyll: diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml index bb0e63c0b..f49bdec7e 100644 --- a/docs/docker-compose.yml +++ b/docs/docker-compose.yml @@ -4,8 +4,8 @@ # with caching and without livereload. # # Usage: -# docker-compose up -d -# docker-compose down +# docker compose up -d +# docker compose down # services: jekyll: diff --git a/docs/installation/docker-compose/index.md b/docs/installation/docker-compose/index.md index e54d700b6..02abeb5d9 100644 --- a/docs/installation/docker-compose/index.md +++ b/docs/installation/docker-compose/index.md @@ -53,7 +53,7 @@ services: SUPPORT_EMAIL: "" PRIVATE_EMAIL_DOMAINS: "" ``` -3. Run `docker-compose up -d` to start the container. +3. Run `docker compose up -d` to start the container. 4. After the container has started, AliasVault should now be running. You can access it at: - Admin Panel: http://localhost/admin diff --git a/docs/installation/script/update/v0.22.0.md b/docs/installation/script/update/v0.22.0.md index 1c97c17d7..a8fbfcfa0 100644 --- a/docs/installation/script/update/v0.22.0.md +++ b/docs/installation/script/update/v0.22.0.md @@ -104,9 +104,9 @@ You can optionally remove the following environment variables from .env as they Pull the latest images and restart your containers: ```bash -docker-compose pull -docker-compose down -docker-compose up -d +docker compose pull +docker compose down +docker compose up -d ``` If you encounter any issues during the upgrade, please join the AliasVault Discord, create an issue on GitHub or contact us by email. diff --git a/docs/installation/script/update/v0.23.0.md b/docs/installation/script/update/v0.23.0.md index 5b606ca1e..264bafb34 100644 --- a/docs/installation/script/update/v0.23.0.md +++ b/docs/installation/script/update/v0.23.0.md @@ -99,9 +99,9 @@ services: After updating your `docker-compose.yml`, pull the latest images and restart your containers: ```bash -docker-compose pull -docker-compose down -docker-compose up -d +docker compose pull +docker compose down +docker compose up -d ``` If you encounter any issues during the upgrade, please join the AliasVault Discord, create an issue on GitHub or contact us by email. \ No newline at end of file