Major updates for 31.0.0 version

CHANGELOG.md

@@ -8,6 +8,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 N/A
 
+## [31.0.0] - 2020-04-30
+
+### Added
+- New `magento-nginx:1.18` Docker image.
+- New `magento-elasticsearch:7.6` Docker image.
+- Documentation to install Magento directly with sample data (using `with-samples-` prefix (thanks Nexcess!).
+
+### Updated
+- The `bin/setup` helper script to enable Elasticsearch 7 and automatically reindex during installation.
+- The `docker-compose.yml` file now references the `magento-nginx:1.18-0` and `magento-elasticsearch:7.6.2-0` Docker images.
+- The `docker-compose.yml` adds the new environment variable `"discovery.type=single-node"` for compatibility with Elasticsearch 7.
+- The new `nginx:1.18` Docker image sets `fastcgi_buffer_size 64k;` and `fastcgi_buffers 8 128k;` directives for Magento 2.3.5 compatibility.
+
+### Removed
+- Old SSL cert being generated directly on Nginx image (deprecated).
+- References to Nginx 1.13 and Elasticsearch 6 images (deprecated).
+
 ## [30.0.3] - 2020-04-25
 
 ### Updated

compose/bin/setup

@@ -87,7 +87,13 @@ bin/clinotty bin/magento setup:config:set --no-interaction  --page-cache=redis -
 echo "Enabling Redis for session..."
 bin/clinotty bin/magento setup:config:set --no-interaction --session-save=redis --session-save-redis-host=redis --session-save-redis-log-level=4 --session-save-redis-db=2
 
-echo "Clearing the cache for good measure..."
+echo "Enabling Elasticsearch..."
+bin/clinotty bin/magento config:set catalog/search/elasticsearch7_server_hostname elasticsearch
+
+echo "Re-indexing with Elasticsearch..."
+bin/clinotty bin/magento indexer:reindex
+
+echo "Clearing the cache to apply updates..."
 bin/clinotty bin/magento cache:flush
 
 echo "Copying files from container to host after install..."

compose/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 #
-# Version 30.0.3
+# Version 31.0.0
 
 version: "3"
 
@@ -15,8 +15,13 @@ services:
       - ./src/composer.json:/var/www/html/composer.json:delegated
       - ./src/composer.lock:/var/www/html/composer.lock:delegated
       - ./src/nginx.conf.sample:/var/www/html/nginx.conf:delegated
+      #- ./src/auth.json:/var/www/html/auth.json:delegated
+      #- ./src/m2-hotfixes:/var/www/html/m2-hotfixes:delegated
+      #- ./src/patches:/var/www/html/patches:delegated
       #- ./src/var/log:/var/www/html/var/log:delegated
       #- ./src/var/report:/var/www/html/var/report:delegated
+      # Linux only: remove the above lines and mount the entire src directory with:
+      #- ./src:/var/www/html:delegated
 
   phpfpm:
     volumes: *appvolumes

compose/docker-compose.yml

@@ -1,13 +1,13 @@
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 #
-# Version 30.0.3
+# Version 31.0.0
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-8
+    image: markoshust/magento-nginx:1.18-0
     ports:
       - "80:8000"
       - "443:8443"
@@ -38,10 +38,12 @@ services:
     image: redis:5.0
 
   elasticsearch:
-    image: markoshust/magento-elasticsearch:6.5.4-0
+    image: markoshust/magento-elasticsearch:7.6.2-0
     ports:
       - "9200:9200"
       - "9300:9300"
+    environment:
+      - "discovery.type=single-node"
 
   rabbitmq:
     image: rabbitmq:3.7-management