Merge branch 'feature/add-backend-login-info' of github.com:YevhenZvi…

…eriev/docker-magento into feature/add-backend-login-info

.github/workflows/build-elasticsearch-7-16.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/7.17
           platforms: linux/amd64,linux/arm64

.github/workflows/build-elasticsearch-7-17.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/7.17
           platforms: linux/amd64,linux/arm64

.github/workflows/build-elasticsearch-8-11.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/8.11
           platforms: linux/amd64,linux/arm64

.github/workflows/build-elasticsearch-8-13.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/8.13
           platforms: linux/amd64,linux/arm64

.github/workflows/build-elasticsearch-8-4.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/8.4
           platforms: linux/amd64,linux/arm64

.github/workflows/build-elasticsearch-8-5.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/8.5
           platforms: linux/amd64,linux/arm64

.github/workflows/build-elasticsearch-8-7.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/elasticsearch/8.7
           platforms: linux/amd64,linux/arm64

.github/workflows/build-nginx-1-18.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/nginx/1.18
           platforms: linux/amd64,linux/arm64

.github/workflows/build-nginx-1-22.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/nginx/1.22
           platforms: linux/amd64,linux/arm64

.github/workflows/build-nginx-1-24.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/nginx/1.24
           platforms: linux/amd64,linux/arm64

.github/workflows/build-opensearch-1-2.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/opensearch/1.2
           platforms: linux/amd64,linux/arm64

.github/workflows/build-opensearch-2-12.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/opensearch/2.12
           platforms: linux/amd64,linux/arm64

.github/workflows/build-opensearch-2-5.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/opensearch/2.5
           platforms: linux/amd64,linux/arm64

.github/workflows/build-php-8-1.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/php/8.1
           platforms: linux/amd64,linux/arm64

.github/workflows/build-php-8-2.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/php/8.2
           platforms: linux/amd64,linux/arm64

.github/workflows/build-php-8-3.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/php/8.3
           platforms: linux/amd64,linux/arm64

.github/workflows/build-rabbitmq-3-11.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/rabbitmq/3.11
           platforms: linux/amd64,linux/arm64

.github/workflows/build-rabbitmq-3-12.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/rabbitmq/3.12
           platforms: linux/amd64,linux/arm64

.github/workflows/build-rabbitmq-3-8.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/rabbitmq/3.9
           platforms: linux/amd64,linux/arm64

.github/workflows/build-rabbitmq-3-9.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/rabbitmq/3.9
           platforms: linux/amd64,linux/arm64

.github/workflows/build-ssh.yml

@@ -24,7 +24,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/php/8.2
           platforms: linux/amd64,linux/arm64

README.md

@@ -159,10 +159,9 @@ After the one-liner above completes running, you should be able to access your s
 
 ## Accessing the Magento Backend
 
-After successfully installing the Magento 2.4.7 environment, you can access the backend by following these steps:
-
-1. Open your web browser and go to the following URL: `https://magento.test/admin`.
+After successfully installing the Magento environment, you can access the backend by following these steps:
 
+1. Open your web browser and go to the following URL: `https://magento.test/admin/`.
 
 2. Use the following default credentials to log in:
 - **Username:** `john.smith`
@@ -175,7 +174,6 @@ If you are testing in a local environment or development setup, and wish to disa
 
 ```bash
 bin/magento module:disable {Magento_TwoFactorAuth,Magento_AdminAdobeImsTwoFactorAuth}
-
 bin/magento cache:clean
 ```
 
@@ -276,8 +274,8 @@ open https://magento.test
 
 ### Elasticsearch vs OpenSearch
 OpenSearch is set as the default search engine when setting up this project. Follow the instructions below if you want to use Elasticsearch instead:
-1. Comment out or remove the `opensearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L55-L66) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L38-L43) files
-2. Uncomment the `elasticsearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L70-L81) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L45-L50) files
+1. Comment out or remove the `opensearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L69-L84) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L36-L41) files
+2. Uncomment the `elasticsearch` container in both the [`compose.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.yaml#L86-L106) and [`compose.healthcheck.yaml`](https://github.com/markshust/docker-magento/blob/master/compose/compose.healthcheck.yaml#L43-L48) files
 3. Update the `bin/setup-install` command to use the Elasticsearch ratther than OpenSearch. Change:
 
 ```
@@ -329,6 +327,7 @@ It is recommended to keep your root docker config files in one repository, and y
 - `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.7 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.7 enterprise`
+- `bin/ece-patches`: Run the Cloud Patches CLI. Ex: `bin/ece-tools apply`
 - `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`

compose/Makefile

@@ -41,6 +41,7 @@ help:
 	@echo "$(call format,docker-compose,'Support V1 (`docker-compose`) and V2 (`docker compose`) docker compose command, and use custom configuration files.')"
 	@echo "$(call format,docker-stats,'Display status for CPU$(comma) memory usage$(comma) and memory limit of currently-running Docker containers.')"
 	@echo "$(call format,download,'Download & extract specific Magento version to the src directory.')"
+	@echo "$(call format,ece-patches,'Run the Cloud Patches CLI.')"
 	@echo "$(call format,fixowns,'This will fix filesystem ownerships within the container.')"
 	@echo "$(call format,fixperms,'This will fix filesystem permissions within the container.')"
 	@echo "$(call format,grunt,'Run the grunt binary.')"