瀏覽代碼

Updating Docker Compose version to 27.1.0

Mark Shust 5 年之前
父節點
當前提交
a346d571f2
共有 3 個文件被更改,包括 14 次插入3 次删除
  1. 9 0
      CHANGELOG.md
  2. 2 2
      compose/bin/setup
  3. 3 1
      compose/docker-compose.yml

+ 9 - 0
CHANGELOG.md

@@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 N/A
 
+## [27.1.0] - 2020-01-20
+
+### Added
+- New `bin/setup-ssl` script to generate valid SSL certificates <a href="https://github.com/markshust/docker-magento/issues/211">#211</a>
+- New `markoshust/magento-nginx:1.13-8` image containing mkcert script
+
+### Updated
+- Updated `bin/setup` to use new `bin/setup-ssl` script
+
 ## [27.0.0] - 2020-01-01
 
 Happy new year! 🎉

+ 2 - 2
compose/bin/setup

@@ -93,8 +93,8 @@ echo "Copying files from container to host after install..."
 bin/copyfromcontainer app
 bin/copyfromcontainer vendor
 
-echo "Restarting containers with host bind mounts for dev..."
-bin/restart
+echo "Generating SSL certificate..."
+bin/setup-ssl $BASE_URL
 
 echo "Docker development environment setup complete."
 echo "You may now access your Magento instance at https://${BASE_URL}/"

+ 3 - 1
compose/docker-compose.yml

@@ -5,7 +5,7 @@ version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-7
+    image: markoshust/magento-nginx:1.13-8
     ports:
       - "80:8000"
       - "443:8443"
@@ -16,6 +16,7 @@ services:
       - ~/.composer:/var/www/.composer:delegated
       - appdata:/var/www/html
       - sockdata:/sock
+      - ssldata:/etc/nginx/certs
 
   phpfpm:
     image: markoshust/magento-php:7.3-fpm-2
@@ -54,3 +55,4 @@ volumes:
   appdata:
   dbdata:
   sockdata:
+  ssldata: