Преглед изворни кода

Merge pull request #1111 from markshust/feature/1110

Release version 46.0.0 for Magento 2.4.7 support #1110
Mark Shust пре 1 година
родитељ
комит
8fee3fd258
3 измењених фајлова са 41 додато и 12 уклоњено
  1. 15 0
      CHANGELOG.md
  2. 5 5
      README.md
  3. 21 7
      compose/compose.yaml

+ 15 - 0
CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [46.0.0] - 2024-04-09
+
+### Added
+- New `bin/check-dependencies` script which provides helpful recommendations for dependencies tailored to the chosen Magento version [PR #1018](https://github.com/markshust/docker-magento/pull/1018/files).
+- New `nginx` Docker images for versions 1.22, 1.24 [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+- New `php-fpm` 8.3 Docker image for Magento 2.4.7 support [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+- New `opensearch` 2.12 Docker image for Magento 2.4.7 support [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+- New `elasticsearch` 7.16 and 8.11 Docker images for previous Magento versions support [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+- New `elasticsearch` 8.13 Docker image for Magento 2.4.7 support [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+- New `rabbitmq` 3.8 Docker image for previous Magento versions support [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+- New `rabbitmq` 3.12 Docker image for Magento 2.4.7 support [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+
+### Updated
+- Link `php-fpm` Docker images to officially compatible Composer versions [PR #1019](https://github.com/markshust/docker-magento/pull/1109).
+
 ## [45.1.0] - 2024-03-19
 
 ### Added

+ 5 - 5
README.md

@@ -149,10 +149,10 @@ mkdir -p ~/Sites/magento
 cd $_
 
 # Run this automated one-liner from the directory you want to install your project.
-curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento.test 2.4.6-p4 community
+curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento.test 2.4.7 community
 ```
 
-The `magento.test` above defines the hostname to use, and the `2.4.6-p4` defines the Magento version to install. Note that since we need a write to `/etc/hosts` for DNS resolution, you will be prompted for your system password during setup.
+The `magento.test` above defines the hostname to use, and the `2.4.7` defines the Magento version to install. Note that since we need a write to `/etc/hosts` for DNS resolution, you will be prompted for your system password during setup.
 
 After the one-liner above completes running, you should be able to access your site at `https://magento.test`.
 
@@ -180,10 +180,10 @@ cd $_
 curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash
 
 # Download the version of Magento you want to use with:
-bin/download 2.4.6-p4 community
+bin/download 2.4.7 community
 # You can specify the version and type (community, enterprise, mageos, mageos-nightly, mageos-mirror, mageos-hypernode-mirror, or mageos-maxcluster-mirror).
 # The mageos type is an alias for mageos-mirror.
-# If no arguments are passed, "2.4.6-p4" and "community" are the default values used.
+# If no arguments are passed, "2.4.7" and "community" are the default values used.
 
 # or for Magento core development:
 # bin/start --no-dev
@@ -304,7 +304,7 @@ It is recommended to keep your root docker config files in one repository, and y
 - `bin/devconsole`: Alias for `bin/n98-magerun2 dev:console`
 - `bin/docker-compose`: Support V1 (`docker-compose`) and V2 (`docker compose`) docker compose command, and use custom configuration files, such as `compose.yml` and `compose.dev.yml`
 - `bin/docker-stats`: Display container name and container ID, status for CPU, memory usage(in MiB and %), and memory limit of currently-running Docker containers.
-- `bin/download`: Download specific Magento version from Composer to the container, with optional arguments of the version (2.4.6-p4 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.6-p4 enterprise`
+- `bin/download`: Download specific Magento version from Composer to the container, with optional arguments of the version (2.4.7 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.7 enterprise`
 - `bin/fixowns`: This will fix filesystem ownerships within the container.
 - `bin/fixperms`: This will fix filesystem permissions within the container.
 - `bin/grunt`: Run the grunt binary. Ex. `bin/grunt exec`

+ 21 - 7
compose/compose.yaml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 45.1.0
+## Version 46.0.0
 
 ## To use SSH, see https://github.com/markshust/docker-magento#ssh
 ## Linux users, see https://github.com/markshust/docker-magento#linux
@@ -14,7 +14,7 @@ version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.18-8
+    image: markoshust/magento-nginx:1.24-0
     ports:
       - "80:8000"
       - "443:8443"
@@ -32,7 +32,7 @@ services:
       #- "host.docker.internal:host-gateway"
 
   phpfpm:
-    image: markoshust/magento-php:8.2-fpm-2
+    image: markoshust/magento-php:8.3-fpm-0
     volumes: *appvolumes
     env_file: env/phpfpm.env
     #extra_hosts: *appextrahosts
@@ -49,13 +49,27 @@ services:
     volumes:
       - dbdata:/var/lib/mysql
 
+  ## If you wish to use MySQL, comment out opensearch image above and
+  ## uncomment this block.
+  #db:
+  #  image: mysql:8.0
+  #  command:
+  #    --max_allowed_packet=64M
+  #    --optimizer_use_condition_selectivity=1
+  #    --optimizer_switch="rowid_filter=off"
+  #  ports:
+  #    - "3306:3306"
+  #  env_file: env/db.env
+  #  volumes:
+  #    - dbdata:/var/lib/mysql
+
   redis:
-    image: redis:7.0-alpine
+    image: redis:7.2-alpine
     ports:
       - "6379:6379"
 
   opensearch:
-    image: markoshust/magento-opensearch:2.5-1
+    image: markoshust/magento-opensearch:2.12-0
     ports:
       - "9200:9200"
       - "9300:9300"
@@ -75,7 +89,7 @@ services:
   # update the bin/setup command to use the $ES_HOST variable as the value for
   # the --elasticsearch-host argument passed to bin/magento setup:install.
   #elasticsearch:
-  #  image: markoshust/magento-elasticsearch:7.17-1
+  #  image: markoshust/magento-elasticsearch:8.13-0
   #  ports:
   #    - "9200:9200"
   #    - "9300:9300"
@@ -90,7 +104,7 @@ services:
   #    - "max_map_count=262144"
 
   rabbitmq:
-    image: markoshust/magento-rabbitmq:3.11-1
+    image: markoshust/magento-rabbitmq:3.12-0
     ports:
       - "15672:15672"
       - "5672:5672"