- Moved `dev/auth.json` to `dev/composer/auth.json`

- Added `client_max_body_size 20M` to nginx.conf
- Added `upload_max_filesize = 20M` and `post_max_size = 20M` to php.ini

CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - New PHP 7.2 image is now available on the dev tag. Please report any issues.
 
+## [16.0.0] - 2018-08-22
+
+### Changed
+- Moved `dev/auth.json` to `dev/composer/auth.json`
+- Added `client_max_body_size 20M` to nginx.conf
+- Added `upload_max_filesize = 20M` and `post_max_size = 20M` to php.ini
+
 ## [15.0.1] - 2018-08-03
 
 ### Fixed

README.md

@@ -6,7 +6,8 @@ View Dockerfiles:
 
 - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/)
   - 1.13
-      - [`latest`, `1.13`, `1.13-3`](https://github.com/markoshust/docker-magento/tree/master/images/nginx/1.13)
+      - [`latest`, `1.13`, `1.13-4`](https://github.com/markoshust/docker-magento/tree/master/images/nginx/1.13)
+      - [`1.13-3`](https://github.com/markoshust/docker-magento/tree/15.0.1/images/nginx/1.13)
       - [`1.13-2`](https://github.com/markoshust/docker-magento/tree/12.0.0/images/nginx/1.13)
       - [`1.13-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/nginx/1.13)
       - [`1.13-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/nginx/1.13)
@@ -14,21 +15,24 @@ View Dockerfiles:
   - 7.2
       - [`dev`, `7.2-fpm`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.2)
   - 7.1
-      - [`latest`, `7.1-fpm`, `7.1-fpm-5`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.1)
+      - [`latest`, `7.1-fpm`, `7.1-fpm-6`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.1)
+      - [`7.1-fpm-5`](https://github.com/markoshust/docker-magento/tree/15.0.1/images/php/7.1)
       - [`7.1-fpm-4`](https://github.com/markoshust/docker-magento/tree/15.0.0/images/php/7.1)
       - [`7.1-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/7.1)
       - [`7.1-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.1)
       - [`7.1-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.1)
       - [`7.1-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.1)
   - 7.0
-      - [`7.0-fpm`, `7.0-fpm-5`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.0)
+      - [`7.0-fpm`, `7.0-fpm-6`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.0)
+      - [`7.0-fpm-5`](https://github.com/markoshust/docker-magento/tree/15.0.1/images/php/7.0)
       - [`7.0-fpm-4`](https://github.com/markoshust/docker-magento/tree/15.0.0/images/php/7.0)
       - [`7.0-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/7.0)
       - [`7.0-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.0)
       - [`7.0-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.0)
       - [`7.0-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.0)
   - 5.6
-      - [`5.6-fpm`, `5.6-fpm-5`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
+      - [`5.6-fpm`, `5.6-fpm-6`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
+      - [`5.6-fpm-5`](https://github.com/markoshust/docker-magento/tree/15.0.1/images/php/5.6)
       - [`5.6-fpm-4`](https://github.com/markoshust/docker-magento/tree/15.0.0/images/php/5.6)
       - [`5.6-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/5.6)
       - [`5.6-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/5.6)
@@ -186,7 +190,7 @@ Open up `src/pub/index.php`, and set a breakpoint near the end of the file. Go t
 
 Please first setup Magento Marketplace authentication (details in the [DevDocs](http://devdocs.magento.com/guides/v2.0/install-gde/prereq/connect-auth.html)).
 
-Update the auth credentials within `./dev/auth.json`, replacing your public and private key respectively:
+Update the auth credentials within `./dev/composer/auth.json`, replacing your public and private key respectively:
 
 ```
 {

compose/magento-1/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 15.0.1
+# Version 16.0.0
 
 version: "3"
 
@@ -18,14 +18,14 @@ services:
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:5.6-fpm-5
+    image: markoshust/magento-php:5.6-fpm-6
     links:
       - db
     volumes: *appvolumes
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
-  #  image: markoshust/magento-php:5.6-fpm-5
+  #  image: markoshust/magento-php:5.6-fpm-6
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  tty: true

compose/magento-1/images/nginx/Dockerfile

@@ -1,3 +1,3 @@
-FROM markoshust/magento-nginx:1.13-3
+FROM markoshust/magento-nginx:1.13-4
 
 COPY ./conf/default.conf /etc/nginx/conf.d/

compose/magento-2-windows/docker-compose.yml

@@ -1,11 +1,11 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 15.0.1
+# Version 16.0.0
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-3
+    image: markoshust/magento-nginx:1.13-4
     ports:
       - 80:8000
     links:
@@ -16,19 +16,19 @@ services:
       - ./src/app:/var/www/html/app:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
       - ~/.composer:/var/www/.composer:delegated
-      - ./dev/auth.json:/var/www/html/var/composer_home/auth.json
-      - ./dev/auth.json:/var/www/.composer/auth.json
+      - ./dev/composer/auth.json:/var/www/html/var/composer_home/auth.json
+      - ./dev/composer/auth.json:/var/www/.composer/auth.json
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm-5
+    image: markoshust/magento-php:7.1-fpm-6
     links:
       - db
     volumes: *appvolumes
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
-  #  image: markoshust/magento-php:7.1-fpm-5
+  #  image: markoshust/magento-php:7.1-fpm-6
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  tty: true

compose/magento-2/docker-compose.yml

@@ -1,11 +1,11 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 15.0.1
+# Version 16.0.0
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-3
+    image: markoshust/magento-nginx:1.13-4
     ports:
       - 80:8000
     links:
@@ -15,19 +15,19 @@ services:
       - ./src:/var/www/html:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
       - ~/.composer:/var/www/.composer:delegated
-      - ./dev/auth.json:/var/www/html/var/composer_home/auth.json
-      - ./dev/auth.json:/var/www/.composer/auth.json
+      - ./dev/composer/auth.json:/var/www/html/var/composer_home/auth.json
+      - ./dev/composer/auth.json:/var/www/.composer/auth.json
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm-5
+    image: markoshust/magento-php:7.1-fpm-6
     links:
       - db
     volumes: *appvolumes
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
-  #  image: markoshust/magento-php:7.1-fpm-5
+  #  image: markoshust/magento-php:7.1-fpm-6
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  tty: true

images/nginx/1.13/conf/nginx.conf

@@ -28,5 +28,7 @@ http {
 
   #gzip on;
 
+  client_max_body_size 20M;
+
   include /etc/nginx/conf.d/*.conf;
 }

images/php/5.6/conf/php.ini

@@ -10,3 +10,6 @@ xdebug.remote_connect_back = 0
 xdebug.remote_enable = 1
 xdebug.remote_host = 10.254.254.254
 xdebug.remote_port = 9001
+
+upload_max_filesize = 20M
+post_max_size = 20M

images/php/7.0/conf/php.ini

@@ -10,3 +10,6 @@ xdebug.remote_connect_back = 0
 xdebug.remote_enable = 1
 xdebug.remote_host = 10.254.254.254
 xdebug.remote_port = 9001
+
+upload_max_filesize = 20M
+post_max_size = 20M

images/php/7.1/conf/php.ini

@@ -10,3 +10,6 @@ xdebug.remote_connect_back = 0
 xdebug.remote_enable = 1
 xdebug.remote_host = 10.254.254.254
 xdebug.remote_port = 9001
+
+upload_max_filesize = 20M
+post_max_size = 20M

images/php/7.2/conf/php.ini

@@ -10,3 +10,6 @@ xdebug.remote_connect_back = 0
 xdebug.remote_enable = 1
 xdebug.remote_host = 10.254.254.254
 xdebug.remote_port = 9001
+
+upload_max_filesize = 20M
+post_max_size = 20M