trwnh
							
						 
						
							 
							
							
								
								
							
							
								
							
								02ad300443 
								
									
								
							
								 
							
						 
						
							
							
								
								increase default upload limit from 1M to 15M  
							
							 
							
							
							
						 
						
							2021-02-06 19:30:58 -06:00  
						
					 
				
					
						
							
							
								 
								Ondrej Brinkel
							
						 
						
							 
							
							
								
								
							
							
								
							
								205705193d 
								
									
								
							
								 
							
						 
						
							
							
								
								fixes docker build  
							
							 
							
							... 
							
							
							
							- composer package prestissimo is deprecated as composer got faster
- `composer update` should not be required as there is a `composer.lock`, actually it was the cause for breaking docker builds as an upstream package had a broken version string in it's requirerements. Using fixed package versions prevents these kinds of problems in future. 
							
						 
						
							2020-12-07 23:11:54 +01:00  
						
					 
				
					
						
							
							
								 
								Strubbl
							
						 
						
							 
							
							
								
								
							
							
								
							
								8c220b97dd 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2020-11-01 21:05:39 +01:00  
						
					 
				
					
						
							
							
								 
								Strubbl
							
						 
						
							 
							
							
								
								
							
							
								
							
								ed7edb8604 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2020-10-24 12:41:08 +02:00  
						
					 
				
					
						
							
							
								 
								Sven Fischer
							
						 
						
							 
							
							
							
								
							
								5bc96a49e7 
								
							
								 
							
						 
						
							
							
								
								docker: update composer to 1.10.12  
							
							 
							
							
							
						 
						
							2020-09-09 18:39:29 +02:00  
						
					 
				
					
						
							
							
								 
								daniel
							
						 
						
							 
							
							
								
								
							
							
								
							
								84280ae8fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2308  from dunn/horizon-7.x  
							
							 
							
							... 
							
							
							
							docker: update horizon command for laravel 7.x 
							
						 
						
							2020-07-21 19:21:35 -06:00  
						
					 
				
					
						
							
							
								 
								Sven Fischer
							
						 
						
							 
							
							
							
								
							
								eeb45756b9 
								
							
								 
							
						 
						
							
							
								
								docker: reduce layers  
							
							 
							
							
							
						 
						
							2020-07-21 18:22:58 +02:00  
						
					 
				
					
						
							
							
								 
								Alexandra Dunn
							
						 
						
							 
							
							
							
								
							
								db271b42e3 
								
							
								 
							
						 
						
							
							
								
								docker: update horizon command for laravel 7.x  
							
							 
							
							
							
						 
						
							2020-07-04 01:31:11 -07:00  
						
					 
				
					
						
							
							
								 
								Armando Lüscher
							
						 
						
							 
							
							
								
								
							
							
								
							
								3e5f3e3d86 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove quotes for docker-php-ext-install commands.  
							
							 
							
							
							
						 
						
							2020-04-19 00:37:35 +02:00  
						
					 
				
					
						
							
							
								 
								Armando Lüscher
							
						 
						
							 
							
							
								
								
							
							
								
							
								eaa28e4be1 
								
									
								
							
								 
							
						 
						
							
							
								
								Make fpm and Apache start scripts executable.  
							
							 
							
							... 
							
							
							
							Fixes  #2121  
							
						 
						
							2020-04-19 00:37:34 +02:00  
						
					 
				
					
						
							
							
								 
								Ashley Hull
							
						 
						
							 
							
							
							
								
							
								5c65b81851 
								
							
								 
							
						 
						
							
							
								
								Docker changes  
							
							 
							
							
							
						 
						
							2020-04-11 23:48:02 +08:00  
						
					 
				
					
						
							
							
								 
								Johnny Malizia
							
						 
						
							 
							
							
							
								
							
								3ba77206b5 
								
							
								 
							
						 
						
							
							
								
								Updated Dockerfiles to include ffmpeg  
							
							 
							
							
							
						 
						
							2020-02-10 23:30:45 -08:00  
						
					 
				
					
						
							
							
								 
								Dominik Strässle
							
						 
						
							 
							
							
							
								
							
								cf5fc9c556 
								
							
								 
							
						 
						
							
							
								
								Fix invalid copy command  
							
							 
							
							
							
						 
						
							2020-02-09 18:43:56 +01:00  
						
					 
				
					
						
							
							
								 
								Dominik Strässle
							
						 
						
							 
							
							
							
								
							
								aede31ea65 
								
							
								 
							
						 
						
							
							
								
								Parallel composer install in Dockerfile and Dockerfile.fpm fix  
							
							 
							
							
							
						 
						
							2020-02-09 18:07:42 +01:00  
						
					 
				
					
						
							
							
								 
								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) 
							
						 
						
							2020-02-09 17:49:12 +01:00  
						
					 
				
					
						
							
							
								 
								Sven Fischer
							
						 
						
							 
							
							
							
								
							
								553ba55e8c 
								
							
								 
							
						 
						
							
							
								
								docker.apache: remove imagick  
							
							 
							
							... 
							
							
							
							cause gd is sufficient. It's either imagick or gd required. 
							
						 
						
							2019-12-07 11:45:38 +01:00  
						
					 
				
					
						
							
							
								 
								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  
							
						 
						
							2019-12-06 18:27:29 +01:00  
						
					 
				
					
						
							
							
								 
								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
``` 
							
						 
						
							2019-11-01 22:48:20 +01:00  
						
					 
				
					
						
							
							
								 
								okpierre
							
						 
						
							 
							
							
								
								
							
							
								
							
								5ff9d92830 
								
									
								
							
								 
							
						 
						
							
							
								
								Update nginx.conf  
							
							 
							
							... 
							
							
							
							Updated to include code to prevent remote code execution on certain nginx/php-fpm configurations 
							
						 
						
							2019-10-26 01:04:28 -04:00  
						
					 
				
					
						
							
							
								 
								Hinaloe
							
						 
						
							 
							
							
								
								
							
							
								
							
								97bd6ae2b1 
								
									
								
							
								 
							
						 
						
							
							
								
								composer prefer-dist instead of source  
							
							 
							
							
							
						 
						
							2019-10-12 17:33:59 +09:00  
						
					 
				
					
						
							
							
								 
								trwnh
							
						 
						
							 
							
							
								
								
							
							
								
							
								c644efa433 
								
									
								
							
								 
							
						 
						
							
							
								
								Update nginx.conf  
							
							 
							
							
							
						 
						
							2019-08-10 17:42:36 -05:00  
						
					 
				
					
						
							
							
								 
								monkeyless
							
						 
						
							 
							
							
							
								
							
								983172bc0a 
								
							
								 
							
						 
						
							
							
								
								Increase peak memory  
							
							 
							
							
							
						 
						
							2019-08-09 05:39:27 +02:00  
						
					 
				
					
						
							
							
								 
								monkeyless
							
						 
						
							 
							
							
							
								
							
								79b231aeb9 
								
							
								 
							
						 
						
							
							
								
								Update to latest the PHP7.3 version  
							
							 
							
							
							
						 
						
							2019-07-13 15:11:04 +02:00  
						
					 
				
					
						
							
							
								 
								monkeyless
							
						 
						
							 
							
							
							
								
							
								1d167294f1 
								
							
								 
							
						 
						
							
							
								
								Add Debian "buster" compatibility  
							
							 
							
							
							
						 
						
							2019-07-13 15:10:38 +02:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								78b97d3238 
								
									
								
							
								 
							
						 
						
							
							
								
								Force upgrade of curl  
							
							 
							
							
							
						 
						
							2019-04-24 22:11:50 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								e24dac14d9 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-24 22:05:45 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								fcbcc2d8fb 
								
									
								
							
								 
							
						 
						
							
							
								
								Upgrade to PHP 7.3  
							
							 
							
							
							
						 
						
							2019-04-24 22:05:09 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								77901a7092 
								
									
								
							
								 
							
						 
						
							
							
								
								Update start.sh  
							
							 
							
							
							
						 
						
							2019-04-24 21:59:13 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								b43588d320 
								
									
								
							
								 
							
						 
						
							
							
								
								Update start.sh  
							
							 
							
							
							
						 
						
							2019-04-22 10:36:58 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								1ee7e776a1 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-22 10:36:28 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								24358c1acb 
								
									
								
							
								 
							
						 
						
							
							
								
								Update start.sh  
							
							 
							
							
							
						 
						
							2019-04-19 01:32:36 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								15c3bed16c 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-18 22:25:12 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								5eadd62e51 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-16 14:18:53 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3e7bf19f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-16 13:50:56 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								a250562be8 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-16 13:50:55 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								2aeb2357f3 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-16 13:16:15 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								601ac77baa 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-16 13:15:06 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								a649fda5f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-16 13:14:13 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								6e6a49096a 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-16 01:12:57 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								84d4134306 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-16 01:12:07 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								ca134b7b1b 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-16 00:13:55 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								d221ca36b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-16 00:13:49 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								7f806406ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.fpm  
							
							 
							
							
							
						 
						
							2019-04-15 11:20:47 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								58c740b802 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-15 11:08:16 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								7591348fe4 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-14 23:42:12 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								3e457116b1 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-14 23:36:58 +08:00  
						
					 
				
					
						
							
							
								 
								Shleeble
							
						 
						
							 
							
							
								
								
							
							
								
							
								2102b492f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Update Dockerfile.apache  
							
							 
							
							
							
						 
						
							2019-04-14 23:35:59 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
								
							
								544bec2cee 
								
							
								 
							
						 
						
							
							
								
								build and install php-intl in Dockerfile.apache.  
							
							 
							
							
							
						 
						
							2019-04-02 18:59:05 +02:00  
						
					 
				
					
						
							
							
								 
								Djyp Forest Fortin
							
						 
						
							 
							
							
								
								
							
							
								
							
								b672ae4ce6 
								
									
								
							
								 
							
						 
						
							
							
								
								Added an env var in the Dockerfile  
							
							 
							
							... 
							
							
							
							Regarding the start.sh file, to run Horizon, this env variable must exist ! 
							
						 
						
							2019-03-13 23:11:17 +01:00  
						
					 
				
					
						
							
							
								 
								techknowlogick
							
						 
						
							 
							
							
								
								
							
							
								
							
								dda0fb438c 
								
									
								
							
								 
							
						 
						
							
							
								
								Speed up docker build times and decrease image size  
							
							 
							
							
							
						 
						
							2019-02-15 00:57:46 -05:00