فهرست منبع

New bin/clinotty script for automated install, reverted bin/cli functionality

Mark Shust 6 سال پیش
والد
کامیت
cce29bf00b

+ 5 - 0
CHANGELOG.md

@@ -8,6 +8,11 @@ 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.
 
+## [18.0.1] - 2018-10-08
+
+### Fixed
+- Reverted old `bin/cli` usage and created `bin/clinotty` for non-tty sessions. Updated calls in `bin/setup` and other scripts where appropriate to `bin/clinotty`.
+
 ## [18.0.0] - 2018-10-06
 
 ### Changed

+ 3 - 0
compose/magento-1/bin/clinotty

@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+docker-compose exec -T phpfpm "$@"

+ 1 - 1
compose/magento-1/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 18.0.0
+# Version 18.0.1
 
 version: "3"
 

+ 1 - 1
compose/magento-2-windows/bin/bash.ps1

@@ -1 +1 @@
-bin/cli bash
+docker-compose exec phpfpm bash

+ 1 - 1
compose/magento-2-windows/bin/cli.ps1

@@ -2,5 +2,5 @@ if ($args.length -eq 0) {
     Write-Host "Please specify a CLI command (ex. ls)"
     exit
 } else {
-    docker-compose exec -T phpfpm $args
+    docker-compose exec phpfpm $args
 }

+ 6 - 0
compose/magento-2-windows/bin/clinotty.ps1

@@ -0,0 +1,6 @@
+if ($args.length -eq 0) {
+    Write-Host "Please specify a CLI command (ex. ls)"
+    exit
+} else {
+    docker-compose exec -T phpfpm $args
+}

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

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 18.0.0
+# Version 18.0.1
 
 version: "3"
 

+ 1 - 1
compose/magento-2/bin/cli

@@ -1,3 +1,3 @@
 #!/bin/bash
 [ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
-docker-compose exec -T phpfpm "$@"
+docker-compose exec phpfpm "$@"

+ 3 - 0
compose/magento-2/bin/clinotty

@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+docker-compose exec -T phpfpm "$@"

+ 3 - 3
compose/magento-2/bin/fixperms

@@ -1,8 +1,8 @@
 #!/bin/bash
 echo "Correcting filesystem permissions..."
 
-bin/cli find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
-bin/cli find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \;
-bin/cli chmod u+x bin/magento
+bin/clinotty find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
+bin/clinotty find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \;
+bin/clinotty chmod u+x bin/magento
 
 echo "Filesystem permissions corrected."

+ 4 - 4
compose/magento-2/bin/setup

@@ -1,9 +1,9 @@
 #!/bin/bash
-bin/cli chmod u+x bin/magento
+bin/clinotty chmod u+x bin/magento
 
 BASE_URL=${1:-magento2.test}
 
-bin/cli bin/magento setup:install \
+bin/clinotty bin/magento setup:install \
   --db-host=db \
   --db-name=magento \
   --db-user=magento \
@@ -22,6 +22,6 @@ bin/cli bin/magento setup:install \
 bin/fixperms
 
 echo "Turning on developer mode.."
-bin/magento deploy:mode:set developer
+bin/clinotty bin/magento deploy:mode:set developer
 
-bin/magento indexer:reindex
+bin/clinotty bin/magento indexer:reindex

+ 1 - 1
compose/magento-2/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 18.0.0
+# Version 18.0.1
 
 version: "3"