Merge branch 'release/2.3.15' into craft-webpack

CHANGELOG.md

@@ -1,9 +1,19 @@
 # nystudio107/craft Change Log
 
+## 2.3.15 - 2020.10.26
+### Added
+* Added `yiisoft/yii2-shell` to `require-dev`
+* Add `--no-dev --no-progress` to the composer install command
+
+### Changed
+* Ignore Nginx requests for `favicon.ico`
+* Removed deprecated `links` from `docker-compose.yaml`
+* Use Composer 2.x
+
 ## 2.3.14 - 2020.10.25
 ### Added
 * Added `/cms/web/dist/*` to root `.gitignore`
-* Use a separate php_xdebug container only when the `XDEBUG_SESSION` cookie is set, so regular requests are more performant
+* Use a separate `php_xdebug` container only when the `XDEBUG_SESSION` cookie is set, so regular requests are more performant
 
 ## 2.3.13 - 2020.09.25
 ### Added

buddy.yml

@@ -25,7 +25,7 @@
       docker_image_tag: "latest"
       execute_commands:
         - "cd cms"
-        - "composer install --no-scripts --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs"
+        - "composer install --no-dev --no-progress --no-scripts --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs"
       setup_commands:
         - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini"
         - "apt-get update && apt-get install -y git zip"

cms/composer.json

@@ -12,6 +12,9 @@
     "nystudio107/craft-webperf": "^1.0.0",
     "nystudio107/craft-twigpack": "^1.1.0"
   },
+  "require-dev": {
+    "yiisoft/yii2-shell": "^2.0.3"
+  },
   "autoload": {
     "psr-4": {
       "modules\\sitemodule\\": "modules/sitemodule/src/"

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "keywords": [
     "craft",
     "cms",

docker-compose.yml

@@ -9,8 +9,6 @@ services:
     env_file: &env
       - ./cms/.env
     init: true
-    links:
-      - php
     ports:
       - "8000:80"
     volumes:
@@ -29,9 +27,6 @@ services:
     expose:
       - "9000"
     init: true
-    links: &php-links
-      - mariadb
-      - redis
     volumes: &php-volumes
       - cpresources:/var/www/project/cms/web/cpresources
       - storage:/var/www/project/cms/storage
@@ -50,8 +45,6 @@ services:
     expose:
       - "9000"
     init: true
-    links:
-      *php-links
     user: www-data
     volumes:
       *php-volumes
@@ -67,8 +60,6 @@ services:
     expose:
       - "9001"
     init: true
-    links:
-      *php-links
     user: www-data
     volumes:
       *php-volumes

docker-config/nginx/default.conf

@@ -26,6 +26,8 @@ server {
     access_log off;
     error_log /dev/stdout info;
 
+    location = /favicon.ico { access_log off; log_not_found off; }
+
     location / {
         try_files $uri/index.html $uri $uri/ /index.php?$query_string;
     }

docker-config/php-dev-base/xdebug.ini

@@ -1,6 +1,6 @@
 xdebug.default_enable=1
 xdebug.remote_enable=1
-xdebug.remote_port=9000
+xdebug.remote_port=9003
 xdebug.remote_handler=dbgp
 xdebug.remote_connect_back=1
 xdebug.remote_host=host.docker.internal

docker-config/php-dev-craft/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update \
         pdo_mysql \
     && \
     # Install Composer
-    curl -sS https://getcomposer.org/installer | php -- --version=1.10.16 --install-dir=/usr/local/bin/ --filename=composer \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     # Clean apt repo caches that don't need to be part of the image
     && \
     apt-get clean \

docker-config/php-prod-craft/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update \
         pdo_mysql \
     && \
     # Install Composer
-    curl -sS https://getcomposer.org/installer | php -- --version=1.10.16 --install-dir=/usr/local/bin/ --filename=composer \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     # Clean apt repo caches that don't need to be part of the image
     && \
     apt-get clean \