aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,694 Commits
6 Branches
43 Tags
125 MiB
Commit Graph

64 Commits (81f23ee970c5612e178b8b28434f9d94adc4630c)

Author SHA1 Message Date
Strubbl 8c220b97dd
Update Dockerfile.apache
Strubbl ed7edb8604
Update Dockerfile.apache
Sven Fischer 5bc96a49e7 docker: update composer to 1.10.12
daniel 84280ae8fc
Merge pull request from dunn/horizon-7.x 
docker: update horizon command for laravel 7.x
Sven Fischer eeb45756b9 docker: reduce layers
Alexandra Dunn db271b42e3 docker: update horizon command for laravel 7.x
Armando Lüscher 3e5f3e3d86
Remove quotes for docker-php-ext-install commands.
Armando Lüscher eaa28e4be1
Make fpm and Apache start scripts executable. 
Fixes
Ashley Hull 5c65b81851 Docker changes
Johnny Malizia 3ba77206b5 Updated Dockerfiles to include ffmpeg
Dominik Strässle cf5fc9c556 Fix invalid copy command
Dominik Strässle aede31ea65 Parallel composer install in Dockerfile and Dockerfile.fpm fix
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)
Sven Fischer 553ba55e8c docker.apache: remove imagick 
cause gd is sufficient. It's either imagick or gd required.
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
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
```
okpierre 5ff9d92830
Update nginx.conf 
Updated to include code to prevent remote code execution on certain nginx/php-fpm configurations
Hinaloe 97bd6ae2b1
composer prefer-dist instead of source
trwnh c644efa433
Update nginx.conf
monkeyless 983172bc0a Increase peak memory
monkeyless 79b231aeb9 Update to latest the PHP7.3 version
monkeyless 1d167294f1 Add Debian "buster" compatibility
Shleeble 78b97d3238
Force upgrade of curl
Shleeble e24dac14d9
Update Dockerfile.apache
Shleeble fcbcc2d8fb
Upgrade to PHP 7.3
Shleeble 77901a7092
Update start.sh
Shleeble b43588d320
Update start.sh
Shleeble 1ee7e776a1
Update Dockerfile.fpm
Shleeble 24358c1acb
Update start.sh
Shleeble 15c3bed16c
Update Dockerfile.fpm
Shleeble 5eadd62e51
Update Dockerfile.apache
Shleeble a3e7bf19f9
Update Dockerfile.apache
Shleeble a250562be8
Update Dockerfile.fpm
Shleeble 2aeb2357f3
Update Dockerfile.fpm
Shleeble 601ac77baa
Update Dockerfile.apache
Shleeble a649fda5f9
Update Dockerfile.fpm
Shleeble 6e6a49096a
Update Dockerfile.fpm
Shleeble 84d4134306
Update Dockerfile.apache
Shleeble ca134b7b1b
Update Dockerfile.fpm
Shleeble d221ca36b7
Update Dockerfile.apache
Shleeble 7f806406ba
Update Dockerfile.fpm
Shleeble 58c740b802
Update Dockerfile.apache
Shleeble 7591348fe4
Update Dockerfile.apache
Shleeble 3e457116b1
Update Dockerfile.apache
Shleeble 2102b492f7
Update Dockerfile.apache
chris 544bec2cee build and install php-intl in Dockerfile.apache.
Djyp Forest Fortin b672ae4ce6
Added an env var in the Dockerfile 
Regarding the start.sh file, to run Horizon, this env variable must exist !
techknowlogick dda0fb438c
Speed up docker build times and decrease image size
M. Hamzah Khan 2b6d282e94 Configure and enable mod_remoteip, and handle X-Forwarded-Proto header.
hnrd 1239fd17d6 pin docker images to PHP 7.2