mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-05-21 10:51:38 +00:00
moved targetarch argument to correct position
This commit is contained in:
parent
c8b5bb12d6
commit
43ac60c8fe
2 changed files with 4 additions and 6 deletions
|
|
@ -2,12 +2,10 @@
|
||||||
ARG BASE_IMAGE=debian:bookworm-slim
|
ARG BASE_IMAGE=debian:bookworm-slim
|
||||||
ARG PHP_VERSION=8.4
|
ARG PHP_VERSION=8.4
|
||||||
ARG NODE_VERSION=22
|
ARG NODE_VERSION=22
|
||||||
ARG TARGETARCH
|
|
||||||
|
|
||||||
# Node.js build stage for building frontend assets
|
# Node.js build stage for building frontend assets
|
||||||
# Use native platform for build stage as it's platform-independent
|
# Use native platform for build stage as it's platform-independent
|
||||||
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-bookworm-slim AS node-builder
|
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-bookworm-slim AS node-builder
|
||||||
|
ARG TARGETARCH
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install composer and minimal PHP for running Symfony commands
|
# Install composer and minimal PHP for running Symfony commands
|
||||||
|
|
@ -66,6 +64,7 @@ RUN yarn cache clean && rm -rf node_modules/
|
||||||
# Base stage for PHP
|
# Base stage for PHP
|
||||||
FROM ${BASE_IMAGE} AS base
|
FROM ${BASE_IMAGE} AS base
|
||||||
ARG PHP_VERSION
|
ARG PHP_VERSION
|
||||||
|
ARG TARGETARCH
|
||||||
|
|
||||||
# Use BuildKit cache mounts for apt in base stage
|
# Use BuildKit cache mounts for apt in base stage
|
||||||
RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt \
|
RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt \
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
ARG NODE_VERSION=22
|
ARG NODE_VERSION=22
|
||||||
ARG TARGETARCH
|
|
||||||
|
|
||||||
# Node.js build stage for building frontend assets
|
# Node.js build stage for building frontend assets
|
||||||
# Use native platform for build stage as it's platform-independent
|
# Use native platform for build stage as it's platform-independent
|
||||||
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-bookworm-slim AS node-builder
|
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-bookworm-slim AS node-builder
|
||||||
|
ARG TARGETARCH
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install composer and minimal PHP for running Symfony commands
|
# Install composer and minimal PHP for running Symfony commands
|
||||||
|
|
@ -64,7 +63,7 @@ RUN yarn cache clean && rm -rf node_modules/
|
||||||
|
|
||||||
# FrankenPHP base stage
|
# FrankenPHP base stage
|
||||||
FROM dunglas/frankenphp:1-php8.4 AS frankenphp_upstream
|
FROM dunglas/frankenphp:1-php8.4 AS frankenphp_upstream
|
||||||
|
ARG TARGETARCH
|
||||||
RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt \
|
RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt \
|
||||||
--mount=type=cache,id=apt-lists-$TARGETARCH,target=/var/lib/apt/lists \
|
--mount=type=cache,id=apt-lists-$TARGETARCH,target=/var/lib/apt/lists \
|
||||||
apt-get update && apt-get -y install \
|
apt-get update && apt-get -y install \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue