فهرست منبع

Version bump 35.0.0

Mark Shust 4 سال پیش
والد
کامیت
6927c58c68
7فایلهای تغییر یافته به همراه35 افزوده شده و 7 حذف شده
  1. 14 1
      CHANGELOG.md
  2. 2 2
      README.md
  3. 3 0
      compose/bin/cliq
  4. 8 0
      compose/bin/devtools-cli-check
  5. 4 0
      compose/bin/start
  6. 1 1
      compose/docker-compose.dev.yml
  7. 3 3
      compose/docker-compose.yml

+ 14 - 1
CHANGELOG.md

@@ -6,7 +6,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 ## [Unreleased]
 ## [Unreleased]
 
 
-- New PHP image with tag `8.0-fpm-develop` available for testing purposes.
+- PHP image `8.0-fpm-develop` now available for testing purposes.
+
+## [35.0.0] - 2021-01-29
+
+### Added
+- Automatically purge caches for a better dev experience [#380](https://github.com/markshust/docker-magento/issues/380).
+- Stop script execution on error [#363](https://github.com/markshust/docker-magento/pull/363/).
+- Make xdebug command understand partials [#371](https://github.com/markshust/docker-magento/pull/371).
+- Extended functionality for `bin/xdebug`, including new `status` and `toggle` commands [#332](https://github.com/markshust/docker-magento/pull/332).
+- Check Elasticsearch connection before setup:install [#326](https://github.com/markshust/docker-magento/pull/326).
+
+### Updated
+- The onelinesetup now accepts a `community` or `enterprise` param to pick version to install [b2399ff1](https://github.com/markshust/docker-magento/commit/ad573f6f3c8d2f7066034cbde936a86eb2399ff1).
+- Fix bin/start for macOS Big Sur [#355](https://github.com/markshust/docker-magento/pull/355/).
 
 
 ## [34.2.0] - 2020-10-15
 ## [34.2.0] - 2020-10-15
 
 

+ 2 - 2
README.md

@@ -249,7 +249,6 @@ It is recommended to keep your root docker config files in one repository, and y
 ## Custom CLI Commands
 ## Custom CLI Commands
 
 
 - `bin/bash`: Drop into the bash prompt of your Docker container. The `phpfpm` container should be mainly used to access the filesystem within Docker.
 - `bin/bash`: Drop into the bash prompt of your Docker container. The `phpfpm` container should be mainly used to access the filesystem within Docker.
-- `bin/cache-clean`: Access the [cache-clean](https://github.com/mage2tv/magento-cache-clean) script from within the container. The watcher is automatically started when `bin/start` is executed. Ex. `bin/cache-clean full_page`
 - `bin/cli`: Run any CLI command without going into the bash prompt. Ex. `bin/cli ls`
 - `bin/cli`: Run any CLI command without going into the bash prompt. Ex. `bin/cli ls`
 - `bin/clinotty`: Run any CLI command with no TTY. Ex. `bin/clinotty chmod u+x bin/magento`
 - `bin/clinotty`: Run any CLI command with no TTY. Ex. `bin/clinotty chmod u+x bin/magento`
 - `bin/cliq`: The same as `bin/cli`, but pipes all output to `/dev/null`. Useful for a quiet CLI, or implementing long-running processes.
 - `bin/cliq`: The same as `bin/cli`, but pipes all output to `/dev/null`. Useful for a quiet CLI, or implementing long-running processes.
@@ -258,6 +257,7 @@ It is recommended to keep your root docker config files in one repository, and y
 - `bin/copytocontainer`: Copy folders or files from host to container. Ex. `bin/copytocontainer --all`
 - `bin/copytocontainer`: Copy folders or files from host to container. Ex. `bin/copytocontainer --all`
 - `bin/dev-urn-catalog-generate`: Generate URN's for PHPStorm and remap paths to local host. Restart PHPStorm after running this command.
 - `bin/dev-urn-catalog-generate`: Generate URN's for PHPStorm and remap paths to local host. Restart PHPStorm after running this command.
 - `bin/devconsole`: Alias for `bin/n98-magerun2 dev:console`
 - `bin/devconsole`: Alias for `bin/n98-magerun2 dev:console`
+- `bin/devtools-cli-check`: Check & install the CLI devtools if missing from system.
 - `bin/download`: Download & extract specific Magento version to the `src` directory. If the archive download fails, it will attempt to download with Composer. Ex. `bin/download 2.4.1`.
 - `bin/download`: Download & extract specific Magento version to the `src` directory. If the archive download fails, it will attempt to download with Composer. Ex. `bin/download 2.4.1`.
 - `bin/fixowns`: This will fix filesystem ownerships within the container.
 - `bin/fixowns`: This will fix filesystem ownerships within the container.
 - `bin/fixperms`: This will fix filesystem permissions within the container.
 - `bin/fixperms`: This will fix filesystem permissions within the container.
@@ -293,7 +293,7 @@ It is recommended to keep your root docker config files in one repository, and y
 
 
 For an improved developer experience, caches are automatically refreshed when related files are updated, courtesy of [cache-clean](https://github.com/mage2tv/magento-cache-clean). This means you can keep all of the standard Magento caches enabled, and this script will only clear the specific caches needed, and only when necessary.
 For an improved developer experience, caches are automatically refreshed when related files are updated, courtesy of [cache-clean](https://github.com/mage2tv/magento-cache-clean). This means you can keep all of the standard Magento caches enabled, and this script will only clear the specific caches needed, and only when necessary.
 
 
-To disable this functionality, uncomment the last line in the `bin/start` file which starts the `bin/cache-clean` watcher.
+To disable this functionality, uncomment the last line in the `bin/start` file to disable the watcher.
 
 
 ### Database
 ### Database
 
 

+ 3 - 0
compose/bin/cliq

@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+bin/clinotty "$@" >/dev/null

+ 8 - 0
compose/bin/devtools-cli-check

@@ -0,0 +1,8 @@
+#!/bin/bash
+if ! bin/clinotty ls /var/www/.composer-global/vendor/bin/cache-clean.js 1> /dev/null 2>&1; then
+  echo "Installing devtools metapackage, just a moment..."
+  bin/cliq mkdir -p /var/www/.composer-global
+  bin/composer init --working-dir=/var/www/.composer-global --quiet --no-interaction
+  bin/composer require --working-dir=/var/www/.composer-global --quiet markshust/magento2-metapackage-devtools-cli:^1.0
+  echo "Devtools installed."
+fi

+ 4 - 0
compose/bin/start

@@ -1,5 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 set -o errexit
 set -o errexit
+
 # Ref: https://stackoverflow.com/a/51789677/9821321
 # Ref: https://stackoverflow.com/a/51789677/9821321
 function parseYaml {
 function parseYaml {
   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
@@ -48,3 +49,6 @@ docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --remove-or
 #bin/root blackfire-agent --register --server-id={YOUR_SERVER_ID} --server-token={YOUR_SERVER_TOKEN}
 #bin/root blackfire-agent --register --server-id={YOUR_SERVER_ID} --server-token={YOUR_SERVER_TOKEN}
 ## Then uncomment the below line (and leave uncommented) to start the agent automatically with bin/start:
 ## Then uncomment the below line (and leave uncommented) to start the agent automatically with bin/start:
 #bin/root /etc/init.d/blackfire-agent start
 #bin/root /etc/init.d/blackfire-agent start
+
+bin/devtools-cli-check
+bin/cliq /var/www/.composer-global/vendor/bin/cache-clean.js --quiet --watch &

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

@@ -1,7 +1,7 @@
 # Mark Shust's Docker Configuration for Magento
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 # (https://github.com/markshust/docker-magento)
 #
 #
-# Version 34.2.0
+# Version 35.0.0
 
 
 version: "3"
 version: "3"
 
 

+ 3 - 3
compose/docker-compose.yml

@@ -1,7 +1,7 @@
 # Mark Shust's Docker Configuration for Magento
 # Mark Shust's Docker Configuration for Magento
 # (https://github.com/markshust/docker-magento)
 # (https://github.com/markshust/docker-magento)
 #
 #
-# Version 34.2.0
+# Version 35.0.0
 
 
 version: "3"
 version: "3"
 
 
@@ -21,7 +21,7 @@ services:
       - ssldata:/etc/nginx/certs
       - ssldata:/etc/nginx/certs
 
 
   phpfpm:
   phpfpm:
-    image: markoshust/magento-php:7.4-fpm-2
+    image: markoshust/magento-php:7.4-fpm-3
     links:
     links:
       - db
       - db
     volumes: *appvolumes
     volumes: *appvolumes
@@ -56,7 +56,7 @@ services:
 
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
   #cron:
-  #  image: markoshust/magento-php:7.4-fpm-2
+  #  image: markoshust/magento-php:7.4-fpm-3
   #  user: root
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  command: /usr/local/bin/cronstart
   #  tty: true
   #  tty: true