From 030928a01e4ffa6b2b52ebebd07de30b38c93caf Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 23 Aug 2021 16:46:30 +0200 Subject: [PATCH] Fix #345 - Add back composer.json and remove non needed source files --- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- apache/Dockerfile | 2 +- fpm-alpine/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d1c75eda..e1b585ae 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -101,7 +101,7 @@ RUN set -ex; \ chown www-data:www-data /var/www/html/tmp; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ - rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \ + rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \ apk del --no-network .fetch-deps diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index e6b0a43e..e521272c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -108,7 +108,7 @@ RUN set -ex; \ chown www-data:www-data /var/www/html/tmp; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ - rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \ + rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \ \ apt-mark auto '.*' > /dev/null; \ diff --git a/apache/Dockerfile b/apache/Dockerfile index 8d68784a..9e560559 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -108,7 +108,7 @@ RUN set -ex; \ chown www-data:www-data /var/www/html/tmp; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ - rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \ + rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \ \ apt-mark auto '.*' > /dev/null; \ diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index ec3a0c0c..1113f898 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -101,7 +101,7 @@ RUN set -ex; \ chown www-data:www-data /var/www/html/tmp; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ - rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \ + rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \ apk del --no-network .fetch-deps diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 0d1b9790..b1205444 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -108,7 +108,7 @@ RUN set -ex; \ chown www-data:www-data /var/www/html/tmp; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ - rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \ + rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \ \ apt-mark auto '.*' > /dev/null; \