Skip to content

Commit 2ab54bb

Browse files
committed
fix: Remove JWT key generation for new Shopware versions
1 parent 18d651e commit 2ab54bb

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

alpine/Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ RUN \
3232
fi && \
3333
composer update --prefer-lowest --prefer-stable --no-interaction -o; \
3434
fi && \
35-
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \
35+
if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
36+
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \
37+
else \
38+
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \
39+
fi && \
3640
php bin/console system:install -fnq --create-database && \
3741
composer clearcache && \
3842
rm -Rf .git && \

debian/Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ RUN \
4242
fi && \
4343
composer update --prefer-lowest --prefer-stable --no-interaction -o; \
4444
fi && \
45-
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq && \
45+
if echo "${SHOPWARE_VERSION}" | grep -q '^trunk'; then \
46+
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \
47+
else \
48+
APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \
49+
fi && \
4650
php bin/console system:install -fnq --create-database && \
4751
composer clearcache && \
4852
rm -Rf .git && \

0 commit comments

Comments
 (0)