Skip to content

Commit 704ea8d

Browse files
committed
fix: Conflict with symfony/type-info <7.1.8 for Shopware 6.7
1 parent 87e8705 commit 704ea8d

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

alpine/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ RUN \
2727
if [ -f composer.lock ]; then \
2828
composer install --no-interaction -o; \
2929
else \
30+
if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
31+
jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
32+
fi && \
3033
composer update --prefer-lowest --prefer-stable --no-interaction -o; \
3134
fi && \
3235
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \

debian/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ RUN \
3737
if [ -f composer.lock ]; then \
3838
composer install --no-interaction -o; \
3939
else \
40+
if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
41+
jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
42+
fi && \
4043
composer update --prefer-lowest --prefer-stable --no-interaction -o; \
4144
fi && \
4245
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \

0 commit comments

Comments
 (0)