From 0918cdee5c79d263cd315db13a4bd8b754d64204 Mon Sep 17 00:00:00 2001
From: Wanne Van Camp <3399877+wannevancamp@users.noreply.github.com>
Date: Thu, 2 Oct 2025 10:22:39 +0200
Subject: [PATCH 1/2] Update Dockerfile

Sync with: https://developer.shopware.com/docs/products/cli/project-commands/build.html#example-docker-image
---
 Dockerfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6c25430..70d33c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,22 @@
 #syntax=docker/dockerfile:1.4
 
-ARG BASE_IMAGE=shopware/docker-base:8.3
-
 # pin versions
-FROM ${BASE_IMAGE} as base-image
-FROM ghcr.io/friendsofshopware/shopware-cli:latest-php-8.3 as shopware-cli
+FROM ghcr.io/shopware/docker-base:8.3 AS base-image
+FROM ghcr.io/shopware/shopware-cli:latest-php-8.3 AS shopware-cli
 
 # build
 
 FROM shopware-cli as build
 
+ARG SHOPWARE_PACKAGES_TOKEN
+
 ADD . /src
 WORKDIR /src
 
-RUN /usr/local/bin/entrypoint.sh shopware-cli project ci /src
-
-# build final image
+RUN --mount=type=secret,id=composer_auth,dst=/src/auth.json \
+    --mount=type=cache,target=/root/.composer \
+    --mount=type=cache,target=/root/.npm \
+    /usr/local/bin/entrypoint.sh shopware-cli project ci /src
 
 FROM base-image
 

From 188665a745ac5997ecfd53856e5bee0486d6339e Mon Sep 17 00:00:00 2001
From: Wanne Van Camp <wanne.vancamp@meteor.be>
Date: Thu, 2 Oct 2025 10:30:44 +0200
Subject: [PATCH 2/2] revert ARG stuff

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 70d33c8..334f696 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 #syntax=docker/dockerfile:1.4
 
+ARG BASE_IMAGE=shopware/docker-base:8.3
+
 # pin versions
-FROM ghcr.io/shopware/docker-base:8.3 AS base-image
+FROM ${BASE_IMAGE} as base-image
 FROM ghcr.io/shopware/shopware-cli:latest-php-8.3 AS shopware-cli
 
 # build