diff options
| author | Max Kostikov <max@kostikov.co> | 2020-07-19 14:58:19 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-07-19 14:58:19 +0200 |
| commit | 5ea7196e78d08550b3ec93d3b708f915b3b0057f (patch) | |
| tree | 07e5f865b6c83898d7ac508302a227509e8207fd /vendor/blueimp/jquery-file-upload/server/php/Dockerfile | |
| parent | d0c7c99d5e1eb27281431231640c7e8c019b90e1 (diff) | |
| parent | fcc47e69e424635fa54b2684329623d4f7694436 (diff) | |
| download | volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.tar.gz volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.tar.bz2 volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'vendor/blueimp/jquery-file-upload/server/php/Dockerfile')
| -rw-r--r-- | vendor/blueimp/jquery-file-upload/server/php/Dockerfile | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/vendor/blueimp/jquery-file-upload/server/php/Dockerfile b/vendor/blueimp/jquery-file-upload/server/php/Dockerfile index 67752f995..7f271b581 100644 --- a/vendor/blueimp/jquery-file-upload/server/php/Dockerfile +++ b/vendor/blueimp/jquery-file-upload/server/php/Dockerfile @@ -11,28 +11,34 @@ RUN ln -s /etc/apache2/mods-available/rewrite.load \ # Install GD, Imagick and ImageMagick as image conversion options: RUN DEBIAN_FRONTEND=noninteractive \ apt-get update && apt-get install -y --no-install-recommends \ - libpng-dev \ - libjpeg-dev \ - libmagickwand-dev \ - imagemagick \ + libpng-dev \ + libjpeg-dev \ + libmagickwand-dev \ + imagemagick \ && pecl install \ - imagick \ + imagick \ && docker-php-ext-enable \ - imagick \ + imagick \ && docker-php-ext-configure \ - gd --with-jpeg=/usr/include/ \ + gd --with-jpeg=/usr/include/ \ && docker-php-ext-install \ - gd \ + gd \ # Uninstall obsolete packages: && apt-get autoremove -y \ - libpng-dev \ - libjpeg-dev \ - libmagickwand-dev \ + libpng-dev \ + libjpeg-dev \ + libmagickwand-dev \ # Remove obsolete files: && apt-get clean \ && rm -rf \ - /tmp/* \ - /usr/share/doc/* \ - /var/cache/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + /tmp/* \ + /usr/share/doc/* \ + /var/cache/* \ + /var/lib/apt/lists/* \ + /var/tmp/* + +# Use the default development configuration: +RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini" + +# Add a custom configuration file: +COPY php.ini "$PHP_INI_DIR/conf.d/" |