From b18df3af37e3dbd989c4c6a8e9353f33d279b42e Mon Sep 17 00:00:00 2001 From: Marius Klocke Date: Wed, 15 Apr 2020 13:50:51 +0200 Subject: [PATCH 1/2] Remove unnecessary pgsql dependency --- shopware5/deps | 1 - shopware6/deps | 1 - 2 files changed, 2 deletions(-) diff --git a/shopware5/deps b/shopware5/deps index a4aca5d..996e43f 100644 --- a/shopware5/deps +++ b/shopware5/deps @@ -9,7 +9,6 @@ mysql opcache openssl pcntl -pgsql redis soap zip diff --git a/shopware6/deps b/shopware6/deps index b161a74..686b4d1 100644 --- a/shopware6/deps +++ b/shopware6/deps @@ -12,7 +12,6 @@ mysql opcache openssl pcntl -pgsql redis soap xml From fbf1835e227f588cc49c54de8122a849bf9b2d6c Mon Sep 17 00:00:00 2001 From: Marius Klocke Date: Wed, 15 Apr 2020 13:51:25 +0200 Subject: [PATCH 2/2] Add dev image variant for Shopware 6 --- shopware6/7.4-dev/Dockerfile | 11 +++++++++++ shopware6/7.4-dev/shopware-dev.ini | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 shopware6/7.4-dev/Dockerfile create mode 100644 shopware6/7.4-dev/shopware-dev.ini diff --git a/shopware6/7.4-dev/Dockerfile b/shopware6/7.4-dev/Dockerfile new file mode 100644 index 0000000..e799828 --- /dev/null +++ b/shopware6/7.4-dev/Dockerfile @@ -0,0 +1,11 @@ +FROM pttde/php:shopware6-7.4 + +RUN apk add --no-cache mysql-client nodejs-npm $PHPIZE_DEPS \ + && pecl install xdebug \ + && rm -rf /tmp/* /var/cache/apk/* \ + && cp "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini" + +RUN ln -s /app/psh.phar /usr/local/bin/psh +COPY shopware-dev.ini $PHP_INI_DIR/conf.d/shopware-dev.ini + +WORKDIR /app diff --git a/shopware6/7.4-dev/shopware-dev.ini b/shopware6/7.4-dev/shopware-dev.ini new file mode 100644 index 0000000..463f9bc --- /dev/null +++ b/shopware6/7.4-dev/shopware-dev.ini @@ -0,0 +1,5 @@ +phar.readonly = 0 +memory_limit = 512M +upload_max_filesize = 100M +post_max_size = 100M +date.timezone = Europe/Berlin