mirror of
https://github.com/aliasvault/aliasvault.git
synced 2026-02-07 04:43:00 -05:00
Update Docker builds to correct target architecture is used to prevent problems with arm64 (#1563)
This commit is contained in:
committed by
Leendert de Borst
parent
e4542ea428
commit
78ff0bb6c5
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 && \
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
# with livereload enabled.
|
||||
#
|
||||
# Usage:
|
||||
# docker-compose up -d
|
||||
# docker-compose down
|
||||
# docker compose up -d
|
||||
# docker compose down
|
||||
#
|
||||
services:
|
||||
jekyll:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
Reference in New Issue
Block a user