Skip to content

Commit fac32d4

Browse files
committed
fix: Add conflicts for Shopware 6.6 versions
1 parent 0561ec1 commit fac32d4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

alpine/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ RUN \
2727
if [ -f composer.lock ]; then \
2828
composer install --no-interaction -o; \
2929
else \
30-
if echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\.7\.)'; then \
30+
if echo "${SHOPWARE_VERSION}" | grep -qE '^v6\.6\.'; then \
31+
jq '.conflict = (.conflict // {}) + { "squirrelphp/twig-php-syntax": "<1.11.0", "symfony/polyfill-php85": "<1.33.0" }' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
32+
elif echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\.7\.)'; then \
3133
jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
3234
fi && \
3335
composer update --prefer-lowest --prefer-stable --no-interaction -o; \

debian/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ RUN \
3939
if [ -f composer.lock ]; then \
4040
composer install --no-interaction -o; \
4141
else \
42-
if echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\.7\.)'; then \
42+
if echo "${SHOPWARE_VERSION}" | grep -qE '^v6\.6\.'; then \
43+
jq '.conflict = (.conflict // {}) + { "squirrelphp/twig-php-syntax": "<1.11.0", "symfony/polyfill-php85": "<1.33.0" }' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
44+
elif echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\.7\.)'; then \
4345
jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
4446
fi && \
4547
composer update --prefer-lowest --prefer-stable --no-interaction -o; \

0 commit comments

Comments
 (0)