Commit Graph

55 Commits (9947050bdf7c0722db9ece1bf0639d414b8e5fbc)

Author SHA1 Message Date
Johnny Malizia 3ba77206b5 Updated Dockerfiles to include ffmpeg 5 years ago
Dominik Strässle cf5fc9c556 Fix invalid copy command 5 years ago
Dominik Strässle aede31ea65 Parallel composer install in Dockerfile and Dockerfile.fpm fix 5 years ago
Dominik Strässle 8f93390a2e
Fix breaking docker build
The Dockerfile.apache has been updated recently, but Dockerfile.fpm not. Due to this, the docker build is failing with the following error:
```
configure: error: unrecognized options: --enable-freetype
The command '/bin/sh -c apt-get update  && apt-get install -y --no-install-recommends apt-utils  && apt-get install -y --no-install-recommends git gosu       optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev       libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6       libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client && sed -i '/en_US/s/^#//g' /etc/locale.gen  && locale-gen && update-locale  && docker-php-source extract  && docker-php-ext-configure gd       --enable-freetype       --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/       --with-xpm-dir=/usr/lib/x86_64-linux-gnu/       --with-webp-dir=/usr/lib/x86_64-linux-gnu/  && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl  && pecl install imagick  && docker-php-ext-enable imagick pcntl imagick gd exif zip curl  && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer  && echo "${COMPOSER_CHECKSUM}  /usr/bin/composer" | sha256sum -c -  && chmod 755 /usr/bin/composer  && apt-get autoremove --purge -y        libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev  && rm -rf /var/cache/apt  && docker-php-source delete' returned a non-zero code: 1
```

This change updates Dockerfile.fpm to equal the Dockerfile.apache variant. (Except the fpm or apache specific settings)
5 years ago
Sven Fischer 553ba55e8c docker.apache: remove imagick
cause gd is sufficient. It's either imagick or gd required.
5 years ago
Sven Fischer ef63e1325f docker.apache: update php to 7.4, composer to 1.9.1, fix gd configure flags
w.r.t gd see also https://github.com/docker-library/php/issues/912
5 years ago
Sven Fischer c62978e192 docker: install mysqldump for backup
This commit installs mysqldump via the package mariadb-client to make
use of `php artisan backup:run`. Without that package the command fails
with the following error:

```
$ docker-compose exec app php artisan backup:run
Starting backup...
Dumping database pixelfed...
Backup failed because The dump process failed with exitcode 127 : Command not found : sh: 1: mysqldump: not found
```
5 years ago
okpierre 5ff9d92830
Update nginx.conf
Updated to include code to prevent remote code execution on certain nginx/php-fpm configurations
5 years ago
Hinaloe 97bd6ae2b1
composer prefer-dist instead of source 5 years ago
trwnh c644efa433
Update nginx.conf 6 years ago
monkeyless 983172bc0a Increase peak memory 6 years ago
monkeyless 79b231aeb9 Update to latest the PHP7.3 version 6 years ago
monkeyless 1d167294f1 Add Debian "buster" compatibility 6 years ago
Shleeble 78b97d3238
Force upgrade of curl 6 years ago
Shleeble e24dac14d9
Update Dockerfile.apache 6 years ago
Shleeble fcbcc2d8fb
Upgrade to PHP 7.3 6 years ago
Shleeble 77901a7092
Update start.sh 6 years ago
Shleeble b43588d320
Update start.sh 6 years ago
Shleeble 1ee7e776a1
Update Dockerfile.fpm 6 years ago
Shleeble 24358c1acb
Update start.sh 6 years ago
Shleeble 15c3bed16c
Update Dockerfile.fpm 6 years ago
Shleeble 5eadd62e51
Update Dockerfile.apache 6 years ago
Shleeble a3e7bf19f9
Update Dockerfile.apache 6 years ago
Shleeble a250562be8
Update Dockerfile.fpm 6 years ago
Shleeble 2aeb2357f3
Update Dockerfile.fpm 6 years ago
Shleeble 601ac77baa
Update Dockerfile.apache 6 years ago
Shleeble a649fda5f9
Update Dockerfile.fpm 6 years ago
Shleeble 6e6a49096a
Update Dockerfile.fpm 6 years ago
Shleeble 84d4134306
Update Dockerfile.apache 6 years ago
Shleeble ca134b7b1b
Update Dockerfile.fpm 6 years ago
Shleeble d221ca36b7
Update Dockerfile.apache 6 years ago
Shleeble 7f806406ba
Update Dockerfile.fpm 6 years ago
Shleeble 58c740b802
Update Dockerfile.apache 6 years ago
Shleeble 7591348fe4
Update Dockerfile.apache 6 years ago
Shleeble 3e457116b1
Update Dockerfile.apache 6 years ago
Shleeble 2102b492f7
Update Dockerfile.apache 6 years ago
chris 544bec2cee build and install php-intl in Dockerfile.apache. 6 years ago
Djyp Forest Fortin b672ae4ce6
Added an env var in the Dockerfile
Regarding the start.sh file, to run Horizon, this env variable must exist !
6 years ago
techknowlogick dda0fb438c
Speed up docker build times and decrease image size 6 years ago
M. Hamzah Khan 2b6d282e94 Configure and enable mod_remoteip, and handle X-Forwarded-Proto header. 6 years ago
hnrd 1239fd17d6 pin docker images to PHP 7.2 6 years ago
Brad Koehn bd822cd5dc
Merge branch 'frontend-ui-refactor' into fix-startup-script 6 years ago
daniel df5e2d94f2
Merge pull request #575 from BenLubar-PR/dockerfile-fpm
Fix Dockerfile.fpm by replacing it with a modified copy of Dockerfile.apache
6 years ago
daniel 89078f399b
Merge pull request #557 from dereckson/docker-webp
Fix WebP support in Apache Docker image
6 years ago
Ben Lubar 88a0b60ae4
Fix Dockerfile.fpm by replacing it with a modified copy of Dockerfile.apache. 6 years ago
Brad Koehn c554bcd84e updated to use correct '=' operator by request 6 years ago
Sébastien Santoro 89a7ac9c37 Fix WebP support in Apache Docker image
With PHP 7, WebP support is now provided by libwebp instead of libvpx.

Reference: http://php.net/manual/en/image.installation.php

Fixes #556.
6 years ago
Brad Koehn de6c95d256 fixed a bash scripting bug in start.sh that prevented horizon from ever starting 6 years ago
kaiyou a5761f7ebf Drop privileges when starting artisan or horizon 6 years ago
kaiyou 37713f33d0 Run pixelfed update tasks upon startup 6 years ago