From 28e9d72814d2d110ebc2cf3a89be6066f3f4d290 Mon Sep 17 00:00:00 2001 From: max Date: Wed, 19 Mar 2025 00:32:03 +0100 Subject: [PATCH 1/3] chore: Add trunk branch to matrix --- .github/workflows/build-docker-images.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-docker-images.yaml b/.github/workflows/build-docker-images.yaml index 9148d79..96ae011 100644 --- a/.github/workflows/build-docker-images.yaml +++ b/.github/workflows/build-docker-images.yaml @@ -291,6 +291,10 @@ jobs: php-version: "8.3" flavour: alpine template: https://github.com/shopware/shopware + - shopware-version: trunk + php-version: "8.3" + flavour: alpine + template: https://github.com/shopware/shopware - shopware-version: v6.4.0.0 php-version: "7.4" flavour: debian @@ -467,6 +471,10 @@ jobs: php-version: "8.3" flavour: debian template: https://github.com/shopware/shopware + - shopware-version: trunk + php-version: "8.3" + flavour: debian + template: https://github.com/shopware/shopware steps: - name: Clone From 18d651e578b5b33a72195193c48cb3c5a44db129 Mon Sep 17 00:00:00 2001 From: max Date: Wed, 19 Mar 2025 16:34:12 +0100 Subject: [PATCH 2/3] fix: Conflict with symfony/type-info <7.1.8 for Shopware 6.7 --- alpine/Dockerfile | 3 +++ debian/Dockerfile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 412d669..779312f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -27,6 +27,9 @@ RUN \ if [ -f composer.lock ]; then \ composer install --no-interaction -o; \ else \ + if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \ + jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \ + fi && \ composer update --prefer-lowest --prefer-stable --no-interaction -o; \ fi && \ APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \ diff --git a/debian/Dockerfile b/debian/Dockerfile index c888521..0e04237 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -37,6 +37,9 @@ RUN \ if [ -f composer.lock ]; then \ composer install --no-interaction -o; \ else \ + if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \ + jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \ + fi && \ composer update --prefer-lowest --prefer-stable --no-interaction -o; \ fi && \ APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \ From 2ab54bb92c0dc75fe1ecaca3fb2573d27a3df1b5 Mon Sep 17 00:00:00 2001 From: max Date: Wed, 19 Mar 2025 15:57:13 +0100 Subject: [PATCH 3/3] fix: Remove JWT key generation for new Shopware versions --- alpine/Dockerfile | 6 +++++- debian/Dockerfile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 779312f..cfceb49 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -32,7 +32,11 @@ RUN \ fi && \ composer update --prefer-lowest --prefer-stable --no-interaction -o; \ fi && \ - APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \ + if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \ + APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \ + else \ + APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \ + fi && \ php bin/console system:install -fnq --create-database && \ composer clearcache && \ rm -Rf .git && \ diff --git a/debian/Dockerfile b/debian/Dockerfile index 0e04237..d33d024 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -42,7 +42,11 @@ RUN \ fi && \ composer update --prefer-lowest --prefer-stable --no-interaction -o; \ fi && \ - APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \ + if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \ + APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \ + else \ + APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \ + fi && \ php bin/console system:install -fnq --create-database && \ composer clearcache && \ rm -Rf .git && \