mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-05-20 10:21:32 +00:00
add target arch to dockerfile caches, to avoid problems
This commit is contained in:
parent
99ae6a51e2
commit
a222939aa6
2 changed files with 8 additions and 8 deletions
|
|
@ -13,8 +13,8 @@ WORKDIR /app
|
||||||
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
||||||
|
|
||||||
# Use BuildKit cache mounts for apt in builder stage
|
# Use BuildKit cache mounts for apt in builder stage
|
||||||
RUN --mount=type=cache,id=apt-cache-node,target=/var/cache/apt \
|
RUN --mount=type=cache,id=apt-cache-node-$TARGETARCH,target=/var/cache/apt \
|
||||||
--mount=type=cache,id=apt-lists-node,target=/var/lib/apt/lists \
|
--mount=type=cache,id=apt-lists-node-$TARGETARCH,target=/var/lib/apt/lists \
|
||||||
apt-get update && apt-get install -y --no-install-recommends \
|
apt-get update && apt-get install -y --no-install-recommends \
|
||||||
php-cli \
|
php-cli \
|
||||||
php-xml \
|
php-xml \
|
||||||
|
|
@ -67,8 +67,8 @@ FROM ${BASE_IMAGE} AS base
|
||||||
ARG PHP_VERSION
|
ARG PHP_VERSION
|
||||||
|
|
||||||
# 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,target=/var/cache/apt \
|
RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt \
|
||||||
--mount=type=cache,id=apt-lists,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 \
|
||||||
apt-transport-https \
|
apt-transport-https \
|
||||||
lsb-release \
|
lsb-release \
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,8 @@ WORKDIR /app
|
||||||
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
||||||
|
|
||||||
# Use BuildKit cache mounts for apt in builder stage
|
# Use BuildKit cache mounts for apt in builder stage
|
||||||
RUN --mount=type=cache,id=apt-cache-node,target=/var/cache/apt \
|
RUN --mount=type=cache,id=apt-cache-node-$TARGETARCH,target=/var/cache/apt \
|
||||||
--mount=type=cache,id=apt-lists-node,target=/var/lib/apt/lists \
|
--mount=type=cache,id=apt-lists-node-$TARGETARCH,target=/var/lib/apt/lists \
|
||||||
apt-get update && apt-get install -y --no-install-recommends \
|
apt-get update && apt-get install -y --no-install-recommends \
|
||||||
php-cli \
|
php-cli \
|
||||||
php-xml \
|
php-xml \
|
||||||
|
|
@ -64,8 +64,8 @@ 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
|
||||||
|
|
||||||
RUN --mount=type=cache,id=apt-cache,target=/var/cache/apt \
|
RUN --mount=type=cache,id=apt-cache-$TARGETARCH,target=/var/cache/apt \
|
||||||
--mount=type=cache,id=apt-lists,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 \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue