diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..253bcb76b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: daily diff --git a/.github/workflows/build-elasticsearch-7.17.yml b/.github/workflows/build-elasticsearch-7-17.yml similarity index 68% rename from .github/workflows/build-elasticsearch-7.17.yml rename to .github/workflows/build-elasticsearch-7-17.yml index e7147f49a..2a7fee100 100644 --- a/.github/workflows/build-elasticsearch-7.17.yml +++ b/.github/workflows/build-elasticsearch-7-17.yml @@ -1,4 +1,4 @@ -name: build-elasticsearch-7.17 +name: build-elasticsearch-7-17 on: workflow_dispatch @@ -8,27 +8,27 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: images/elasticsearch/7.17 platforms: linux/amd64,linux/arm64 push: true tags: | markoshust/magento-elasticsearch:7.17 - markoshust/magento-elasticsearch:7.17-0 + markoshust/magento-elasticsearch:7.17-1 diff --git a/.github/workflows/build-elasticsearch-8.4.yml b/.github/workflows/build-elasticsearch-8-4.yml similarity index 63% rename from .github/workflows/build-elasticsearch-8.4.yml rename to .github/workflows/build-elasticsearch-8-4.yml index 9c00b7e9f..c43fbe4f4 100644 --- a/.github/workflows/build-elasticsearch-8.4.yml +++ b/.github/workflows/build-elasticsearch-8-4.yml @@ -1,4 +1,4 @@ -name: build-elasticsearch-8.4 +name: build-elasticsearch-8-4 on: workflow_dispatch @@ -8,26 +8,27 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: images/elasticsearch/8.4 platforms: linux/amd64,linux/arm64 push: true tags: | - markoshust/magento-elasticsearch:8.4-develop + markoshust/magento-elasticsearch:8.4 + markoshust/magento-elasticsearch:8.4-0 diff --git a/.github/workflows/build-elasticsearch-8-5.yml b/.github/workflows/build-elasticsearch-8-5.yml new file mode 100644 index 000000000..0de9167dc --- /dev/null +++ b/.github/workflows/build-elasticsearch-8-5.yml @@ -0,0 +1,34 @@ +name: build-elasticsearch-8-5 + +on: workflow_dispatch + +jobs: + elasticsearch-8-5: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v5 + with: + context: images/elasticsearch/8.5 + platforms: linux/amd64,linux/arm64 + push: true + tags: | + markoshust/magento-elasticsearch:8.5 + markoshust/magento-elasticsearch:8.5-0 diff --git a/.github/workflows/build-elasticsearch.yml b/.github/workflows/build-elasticsearch.yml deleted file mode 100644 index 3c9e5684c..000000000 --- a/.github/workflows/build-elasticsearch.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: build-elasticsearch - -on: workflow_dispatch - -jobs: - elasticsearch-7-17: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: images/elasticsearch/7.17 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - markoshust/magento-elasticsearch:7.17 - markoshust/magento-elasticsearch:7.17-0 - elasticsearch-8-4: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: images/elasticsearch/8.4 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - markoshust/magento-elasticsearch:8.4-develop diff --git a/.github/workflows/build-nginx.yml b/.github/workflows/build-nginx-1-18.yml similarity index 73% rename from .github/workflows/build-nginx.yml rename to .github/workflows/build-nginx-1-18.yml index 4fbb17cf7..fa212cf37 100644 --- a/.github/workflows/build-nginx.yml +++ b/.github/workflows/build-nginx-1-18.yml @@ -1,4 +1,4 @@ -name: build-nginx +name: build-nginx-1-18 on: workflow_dispatch @@ -8,23 +8,23 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: images/nginx/1.18 platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/build-opensearch-1-2.yml b/.github/workflows/build-opensearch-1-2.yml new file mode 100644 index 000000000..526d4aaee --- /dev/null +++ b/.github/workflows/build-opensearch-1-2.yml @@ -0,0 +1,34 @@ +name: build-opensearch-1-2 + +on: workflow_dispatch + +jobs: + opensearch-1-2: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v5 + with: + context: images/opensearch/1.2 + platforms: linux/amd64,linux/arm64 + push: true + tags: | + markoshust/magento-opensearch:1.2 + markoshust/magento-opensearch:1.2-0 diff --git a/.github/workflows/build-opensearch.yml b/.github/workflows/build-opensearch-2-5.yml similarity index 58% rename from .github/workflows/build-opensearch.yml rename to .github/workflows/build-opensearch-2-5.yml index a9b888c45..fbd4e53b6 100644 --- a/.github/workflows/build-opensearch.yml +++ b/.github/workflows/build-opensearch-2-5.yml @@ -1,4 +1,4 @@ -name: build-opensearch +name: build-opensearch-2-5 on: workflow_dispatch @@ -8,26 +8,27 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: - context: images/opensearch/2.4 + context: images/opensearch/2.5 platforms: linux/amd64,linux/arm64 push: true tags: | - markoshust/magento-opensearch:2.5-0 + markoshust/magento-opensearch:2.5 + markoshust/magento-opensearch:2.5-1 diff --git a/.github/workflows/build-php-8.1.yml b/.github/workflows/build-php-8-1.yml similarity index 68% rename from .github/workflows/build-php-8.1.yml rename to .github/workflows/build-php-8-1.yml index 1976dc71e..88fcbc0c4 100644 --- a/.github/workflows/build-php-8.1.yml +++ b/.github/workflows/build-php-8-1.yml @@ -1,4 +1,4 @@ -name: build-php-8.1 +name: build-php-8-1 on: workflow_dispatch @@ -8,27 +8,27 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: images/php/8.1 platforms: linux/amd64,linux/arm64 push: true tags: | markoshust/magento-php:8.1-fpm - markoshust/magento-php:8.1-fpm-1 + markoshust/magento-php:8.1-fpm-2 diff --git a/.github/workflows/build-php-8.2.yml b/.github/workflows/build-php-8-2.yml similarity index 68% rename from .github/workflows/build-php-8.2.yml rename to .github/workflows/build-php-8-2.yml index b012d9f77..8f09f8825 100644 --- a/.github/workflows/build-php-8.2.yml +++ b/.github/workflows/build-php-8-2.yml @@ -1,4 +1,4 @@ -name: build-php-8.2 +name: build-php-8-2 on: workflow_dispatch @@ -8,27 +8,27 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: images/php/8.2 platforms: linux/amd64,linux/arm64 push: true tags: | markoshust/magento-php:8.2-fpm - markoshust/magento-php:8.2-fpm-0 + markoshust/magento-php:8.2-fpm-1 diff --git a/.github/workflows/build-php-8-3.yml b/.github/workflows/build-php-8-3.yml new file mode 100644 index 000000000..c140c3dbb --- /dev/null +++ b/.github/workflows/build-php-8-3.yml @@ -0,0 +1,34 @@ +name: build-php-8-3 + +on: workflow_dispatch + +jobs: + php-8-3: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v5 + with: + context: images/php/8.3 + platforms: linux/amd64,linux/arm64 + push: true + tags: | + markoshust/magento-php:8.3-fpm + markoshust/magento-php:8.3-fpm-develop diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml deleted file mode 100644 index 9c0e1420c..000000000 --- a/.github/workflows/build-php.yml +++ /dev/null @@ -1,63 +0,0 @@ -name: build-php - -on: workflow_dispatch - -jobs: - php-8-1: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: images/php/8.1 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - markoshust/magento-php:8.1-fpm - markoshust/magento-php:8.1-fpm-1 - php-8-2: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: images/php/8.2 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - markoshust/magento-php:8.2-fpm - markoshust/magento-php:8.2-fpm-0 diff --git a/.github/workflows/build-rabbitmq-3-11.yml b/.github/workflows/build-rabbitmq-3-11.yml new file mode 100644 index 000000000..df2786adf --- /dev/null +++ b/.github/workflows/build-rabbitmq-3-11.yml @@ -0,0 +1,34 @@ +name: build-rabbitmq-3-11 + +on: workflow_dispatch + +jobs: + rabbitmq-3-11: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v5 + with: + context: images/rabbitmq/3.11 + platforms: linux/amd64,linux/arm64 + push: true + tags: | + markoshust/magento-rabbitmq:3.11 + markoshust/magento-rabbitmq:3.11-1 diff --git a/.github/workflows/build-rabbitmq-3-9.yml b/.github/workflows/build-rabbitmq-3-9.yml new file mode 100644 index 000000000..f126d3d96 --- /dev/null +++ b/.github/workflows/build-rabbitmq-3-9.yml @@ -0,0 +1,34 @@ +name: build-rabbitmq-3-9 + +on: workflow_dispatch + +jobs: + rabbitmq-3-9: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v5 + with: + context: images/rabbitmq/3.9 + platforms: linux/amd64,linux/arm64 + push: true + tags: | + markoshust/magento-rabbitmq:3.9 + markoshust/magento-rabbitmq:3.9-0 diff --git a/.github/workflows/build-rabbitmq.yml b/.github/workflows/build-rabbitmq.yml deleted file mode 100644 index 4989f0c98..000000000 --- a/.github/workflows/build-rabbitmq.yml +++ /dev/null @@ -1,63 +0,0 @@ -name: build-rabbitmq - -on: workflow_dispatch - -jobs: - rabbitmq-3-9: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: images/rabbitmq/3.9 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - markoshust/magento-rabbitmq:3.9 - markoshust/magento-rabbitmq:3.9-0 - rabbitmq-3-11: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: images/rabbitmq/3.9 - platforms: linux/amd64,linux/arm64 - push: true - tags: | - markoshust/magento-rabbitmq:3.11 - markoshust/magento-rabbitmq:3.11-0 diff --git a/.github/workflows/build-ssh.yml b/.github/workflows/build-ssh.yml index 70d4d3968..7f12e4d01 100644 --- a/.github/workflows/build-ssh.yml +++ b/.github/workflows/build-ssh.yml @@ -8,25 +8,25 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: - context: images/php/7.3 + context: images/php/8.2 platforms: linux/amd64,linux/arm64 push: true tags: markoshust/ssh diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 73b071ae7..a05421995 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run ShellCheck uses: ludeeus/action-shellcheck@master diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1b4b81a..6a2a69daa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,40 @@ 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). +## [45.0.0] - 2024-02-25 + +### Added +- New PHP images based on bookworm, pegging pecl libraries for more predictability [PR #1071](https://github.com/markshust/docker-magento/pull/1071). +- New PHP 8.3 image [PR #1071](https://github.com/markshust/docker-magento/pull/1071). +- PHP SPX profiler to enhance performance monitoring capabilities [PR #533](https://github.com/markshust/docker-magento/pull/533). +- Support for the `strace` command, providing developers with powerful tools for diagnosing and troubleshooting [PR #1033](https://github.com/markshust/docker-magento/pull/1033). +- Ability for xdebug to listen to Magento CLI commands [PR #846](https://github.com/markshust/docker-magento/pull/846). +- Abstraction of setup script into two scripts [PR #874](https://github.com/markshust/docker-magento/pull/874). +- New Docker image for OpenSearch 2.4 [PR #858](https://github.com/markshust/docker-magento/pull/858). +- Mage-OS mirror support [PR #835](https://github.com/markshust/docker-magento/pull/835). +- New `bin/log` command to view Magento logs in real-time [PR #1060](https://github.com/markshust/docker-magento/pull/1060). +- New `bin/docker-stats` command for container monitoring [PR #533](https://github.com/markshust/docker-magento/pull/533). +- New `bin/setup-pwa-studio-sampledata` command to install Magento PWA Studio sample data, facilitating easier PWA development setups [#1045](https://github.com/markshust/docker-magento/pull/1045). +- New `bin/deploy` script to deply Magento in pipeline [PR #926](https://github.com/markshust/docker-magento/pull/926). +- New `bin/magento-version` script which outputs current Magento version [PR #931](https://github.com/markshust/docker-magento/pull/931). +- New `bin/spx` script to enable or disable SPX [PR #1074](https://github.com/markshust/docker-magento/pull/1074). + +### Updated +- Node.js to version 20.x LTS [PR #1071](https://github.com/markshust/docker-magento/pull/1071). +- Support for Magento 2.4.6-p4, updating the default Magento version in the Docker setup to align with the latest Magento release [PR #1063](https://github.com/markshust/docker-magento/pull/1063). +- Continuous integration and deployment processes were refined to include updates and to maintain dependencies through GitHub Actions and Dependabot, ensuring that the project's dependencies remain up to date and secure [PR #1032](https://github.com/markshust/docker-magento/pull/1032). +- Rework docker compose script to allow future extensibility [PR #1002](https://github.com/markshust/docker-magento/pull/1002). +- Replaced phpmyadmin Docker image with amd64-compatible image [PR #939](https://github.com/markshust/docker-magento/pull/939). +- Set default Magento 2.4.6 search engine to OpenSearch [PR #937](https://github.com/markshust/docker-magento/pull/937). +- Use `/usr/bin/env` to discover bash location [PR #879](https://github.com/markshust/docker-magento/pull/879). + +### Fixed +- Execution rights in scripts [PR #1039](https://github.com/markshust/docker-magento/pull/1039). +- Bug with Elasticsearch documentation [PR #1014](https://github.com/markshust/docker-magento/pull/1014). +- Elasticsearch JAVA OPTS issue with containers not starting at startup [PR #938](https://github.com/markshust/docker-magento/pull/938). +- Unexpected Ubuntu 18.04 startup failure [PR #310](https://github.com/markshust/docker-magento/pull/310). +- Failing `npm install` of puppeteer due to missing Chromium [PR #848](https://github.com/markshust/docker-magento/pull/848). + ## [44.0.0] - 2022-12-05 ### Added diff --git a/README.md b/README.md index 13d38677f..98810fa05 100644 --- a/README.md +++ b/README.md @@ -30,16 +30,20 @@ View Dockerfiles for the latest tags: - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/) - [`1.18`, `1.18-8`](images/nginx/1.18) - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/) - - [`8.1-fpm`, `8.1-fpm-1`](images/php/8.1) - - [`8.2-fpm-develop`](images/php/8.2) + - [`8.1-fpm`, `8.1-fpm-2`](images/php/8.1) + - [`8.2-fpm`, `8.2-fpm-1`](images/php/8.2) + - [`8.3-fpm`, `8.3-fpm-develop`](images/php/8.3) - [markoshust/magento-opensearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-opensearch/) - [`1.2`, `1.2-0`](images/opensearch/1.2) - - [`2.4-develop`](images/opensearch/2.4) + - [`2.5`, `2.5-1`](images/opensearch/2.5) - [markoshust/magento-elasticsearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-elasticsearch/) - - [`7.17`, `7.17-0`](images/elasticsearch/7.17) - - [`8.4-develop`](images/elasticsearch/8.4) + - [`7.17`, `7.17-1`](images/elasticsearch/7.17) + - [`8.4`, `8.4-0`](images/elasticsearch/8.4) + - [`8.5`, `8.5-0`](images/elasticsearch/8.5) + - [`8.7`, `8.7-0`](images/elasticsearch/8.7) - [markoshust/magento-rabbitmq (Docker Hub)](https://hub.docker.com/r/markoshust/magento-rabbitmq/) - [`3.9`, `3.9-0`](images/rabbitmq/3.9) + - [`3.11`, `3.11-1`](images/rabbitmq/3.11) - [markoshust/ssh (Docker Hub)](https://hub.docker.com/r/markoshust/magento-ssh/) - [`latest`](images/ssh) @@ -131,10 +135,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-p3 community +curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- magento.test 2.4.6-p4 community ``` -The `magento.test` above defines the hostname to use, and the `2.4.6-p3` 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.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. After the one-liner above completes running, you should be able to access your site at `https://magento.test`. @@ -162,10 +166,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-p3 community +bin/download 2.4.6-p4 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-p3" and "community" are the default values used. +# If no arguments are passed, "2.4.6-p4" and "community" are the default values used. # or for Magento core development: # bin/start --no-dev @@ -181,8 +185,8 @@ bin/download 2.4.6-p3 community # --opensearch-port="$OPENSEARCH_PORT" \ # --search-engine=opensearch \ # with: -# --elasticsearch-host="$OPENSEARCH_HOST" \ -# --elasticsearch-port="$OPENSEARCH_PORT" \ +# --elasticsearch-host="$ES_HOST" \ +# --elasticsearch-port="$ES_PORT" \ # --search-engine=elasticsearch7 \ # Run the setup installer for Magento: @@ -279,7 +283,7 @@ It is recommended to keep your root docker config files in one repository, and y - `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/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/download`: Download specific Magento version from Composer to the container, with optional arguments of the version (2.4.6-p3 [default]) and type ("community" [default], "enterprise", or "mageos"). Ex. `bin/download 2.4.6-p3 enterprise` +- `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/debug-cli`: Enable Xdebug for bin/magento, with an optional argument of the IDE key. Defaults to PHPSTORM Ex. `bin/debug-cli enable PHPSTORM` - `bin/deploy`: Runs the standard Magento deployment process commands. Pass extra locales besides `en_US` via an optional argument. Ex. `bin/deploy nl_NL` - `bin/docker-stats`: Display status for CPU, memory usage, and memory limit of currently-running Docker containers. @@ -287,6 +291,7 @@ It is recommended to keep your root docker config files in one repository, and y - `bin/fixperms`: This will fix filesystem permissions within the container. - `bin/grunt`: Run the grunt binary. Ex. `bin/grunt exec` - `bin/install-php-extensions`: Install PHP extension in the container. Ex. `bin/install-php-extensions sourceguardian` +- `bin/log`: Monitor the Magento log files. Pass no params to tail all files. Ex. `bin/log debug.log` - `bin/magento`: Run the Magento CLI. Ex: `bin/magento cache:flush` - `bin/mftf`: Run the Magento MFTF. Ex: `bin/mftf build:project` - `bin/mysql`: Run the MySQL CLI with database config from `env/db.env`. Ex. `bin/mysql -e "EXPLAIN core_config_data"` or`bin/mysql < magento.sql` @@ -309,9 +314,11 @@ It is recommended to keep your root docker config files in one repository, and y - `bin/setup-composer-auth`: Setup authentication credentials for Composer. - `bin/setup-domain`: Setup Magento domain name. Ex: `bin/setup-domain magento.test` - `bin/setup-grunt`: Install and configure Grunt JavaScript task runner to compile .less files -- `bin/setup-pwa-studio`: (BETA) Install PWA Studio (requires NodeJS and Yarn to be installed on the host machine). Pass in your base site domain, otherwise the default `master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud` will be used. Ex: `bin/setup-pwa-studio magento.test` +- `bin/setup-pwa-studio`: (BETA) Install PWA Studio (requires NodeJS and Yarn to be installed on the host machine). Pass in your base site domain, otherwise the default `master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud` will be used. Ex: `bin/setup-pwa-studio magento.test`. +- `bin/setup-pwa-studio-sampledata`: This script makes it easier to install Venia sample data. Pass in your base site domain, otherwise the default `master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud` will be used. Ex: `bin/setup-pwa-studio-sampledata magento.test`. - `bin/setup-ssl`: Generate an SSL certificate for one or more domains. Ex. `bin/setup-ssl magento.test foo.test` - `bin/setup-ssl-ca`: Generate a certificate authority and copy it to the host. +- `bin/spx`: Disable or enable output compression to enable or disbale SPX. Accepts params `disable` (default) or `enable`. Ex. `bin/spx enable` - `bin/start`: Start all containers, good practice to use this instead of `docker-compose up -d`, as it may contain additional helpers. - `bin/status`: Check the container status. - `bin/stop`: Stop all project containers. @@ -596,7 +603,7 @@ To use it: In Cloudflare Tunnel configuration, configure the service URL to use type `HTTPS` and a URL of `{name of app container}:{HTTPS port of app container}`. For examplem, `demo-app-1:8443`. Enable the `No TLS Verify` option, since our local certificates are self-signed. You should now be able to access your app via the public hostname defined in Cloudflare Tunnel. -NOTE: Do not leave instances with Cloudflare Tunnel enabled running long-term, as your instance is publicly available to the world. You should ideally turn off tunnel container once testing is finished. +NOTE: Do not leave instances with Cloudflare Tunnel enabled running long-term, as your instance is publicly available to the world. You should ideally turn off tunnel container once testing is finished. ### MFTF @@ -690,6 +697,32 @@ body { Upon saving this file, we will see the Grunt watcher detect the changes, and your browser should automatically load the new style without you needing to refresh the page, and without a full browser refresh. +### PHP-SPX + +The images also have additional profiler-tracers built-in to the Web UI. + +To access the control panel, just open the following URL: `https://magento.test/?SPX_UI_URI=/` + +**Suggested Configuration** + +- Enabled: Checked +- Automatic start: Checked +- Profile internal functions: Unchecked +- Sampling: 5ms +- Max profiling depth: Unlimited +- Additional metrics: Unselected + +Changing any options on this page set cookies for the domain for these settings. After then visiting a page on the frontend, you can navigate back to the GUI and scroll to the bottom of the page, and click the related request to view the trace of the request & response. + +Profiling is also possible via command line, or curl: + +``` +SPX_REPORT=full SPX_ENABLED=1 SPX_SAMPLING_PERIOD=5000 bin/magento {command_name} +curl --cookie "SPX_REPORT=full; SPX_ENABLED=1; SPX_SAMPLING_PERIOD=5000" https://magento.test/ +``` + +Additional information of how to work with SPX is available at https://www.youtube.com/watch?v=xk-JiBLsKfA + ## Credits ### M.academy diff --git a/compose/Makefile b/compose/Makefile index a564af9cb..fe8aa0be8 100644 --- a/compose/Makefile +++ b/compose/Makefile @@ -31,11 +31,12 @@ help: @echo "$(call format,dev-urn-catalog-generate,'Generate URNs for PHPStorm and remap paths to local host.')" @echo "$(call format,devconsole,'Alias for n98-magerun2 dev:console.')" @echo "$(call format,devtools-cli-check,'Check & install the CLI devtools if missing from system.')" - @echo "$(call format,docker-stats,'Display status for CPU, memory usage, and memory limit of currently-running Docker containers.')" + @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,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.')" + @echo "$(call format,log,'Monitor the Magento log files. Pass no params to tail all files.')" @echo "$(call format,magento,'Run the Magento CLI.')" @echo "$(call format,mftf,'Run the Magento MFTF.')" @echo "$(call format,mysql,'Run the MySQL CLI with database config from env/db.env.')" @@ -58,6 +59,7 @@ help: @echo "$(call format,setup-pwa-studio,'(BETA) Install PWA Studio.')" @echo "$(call format,setup-ssl,'Generate an SSL certificate for one or more domains.')" @echo "$(call format,setup-ssl-ca,'Generate a certificate authority and copy it to the host.')" + @echo "$(call format,spx,'Disable or enable output compression to enable or disbale SPX.')" @echo "$(call format,start,'Start all containers.')" @echo "$(call format,status,'Check the container status.')" @echo "$(call format,stop,'Stop all containers.')" diff --git a/compose/bin/deploy b/compose/bin/deploy old mode 100644 new mode 100755 diff --git a/compose/bin/docker-stats b/compose/bin/docker-stats index 8370d8641..73ec9a91b 100755 --- a/compose/bin/docker-stats +++ b/compose/bin/docker-stats @@ -7,18 +7,45 @@ INTERVAL=3 trap 'stty echo; exit' INT EXIT print_header() { - echo "+----------------------------------------------------+--------------+----------+----------+----------------+" - printf "| %-50s | %-12s | %-8s | %-8s | %-14s |\n" "NAME" "CONTAINER ID" "CPU %" "MEM %" "MEM USAGE" - echo "+----------------------------------------------------+--------------+----------+----------+----------------+" + echo "+----------------------------------------------------+--------------+----------+----------+------------------------+" + printf "| %-50s | %-12s | %-8s | %-8s | %-22s |\n" "NAME" "CONTAINER ID" "CPU %" "MEM %" "MEM USAGE / MEM LIMIT" + echo "+----------------------------------------------------+--------------+----------+----------+------------------------+" } print_container_info() { - local container_info=($1) - local container_name=${container_info[0]} - local container_id=${container_info[1]} - local container_stats=(${container_info[@]:2}) + local container_info + local container_name + local container_id + local cpu_perc + local mem_perc + local mem_usage + + container_info="$1" + container_name=$(echo "$container_info" | cut -f1) + container_id=$(echo "$container_info" | cut -f2) + cpu_perc=$(echo "$container_info" | cut -f3) + mem_perc=$(echo "$container_info" | cut -f4) + mem_usage=$(echo "$container_info" | cut -f5) + + +print_container_info() { + local container_info + local container_name + local container_id + local cpu_perc + local mem_perc + local mem_usage + + container_info="$1" + container_name=$(echo "$container_info" | cut -f1) + container_id=$(echo "$container_info" | cut -f2) + cpu_perc=$(echo "$container_info" | cut -f3) + mem_perc=$(echo "$container_info" | cut -f4) + mem_usage=$(echo "$container_info" | cut -f5) + + printf "| %-50s | %-12s | %-8s | %-8s | %-22s |\n" "$container_name" "$container_id" "$cpu_perc" "$mem_perc" "$mem_usage" +} - printf "| %-50s | %-12s | %-8s | %-8s | %-14s |\n" "$container_name" "$container_id" "${container_stats[0]}" "${container_stats[1]}" "${container_stats[2]}" } while true; do @@ -26,14 +53,14 @@ while true; do clear - if [[ ! -z "$DOCKER_STATS" ]]; then + if [[ -n "$DOCKER_STATS" ]]; then print_header while IFS= read -r line; do print_container_info "$(echo "$line" | awk '{gsub(/\//, " "); print}')" done <<< "$DOCKER_STATS" - echo "+----------------------------------------------------+--------------+----------+----------+----------------+" + echo "+----------------------------------------------------+--------------+----------+----------+------------------------+" else echo "No active containers found" break @@ -41,3 +68,4 @@ while true; do sleep $INTERVAL done + diff --git a/compose/bin/download b/compose/bin/download index c8a2c5bf7..452fcba85 100755 --- a/compose/bin/download +++ b/compose/bin/download @@ -1,8 +1,13 @@ #!/usr/bin/env bash -VERSION=${1:-2.4.6-p3} +VERSION=${1:-2.4.6-p4} EDITION=${2:-community} +# Define ANSI escape codes for colors +YELLOW='\033[0;33m' +BLUE='\033[0;34m' +NC='\033[0m' # No Color + bin/stop bin/start --no-dev @@ -24,5 +29,8 @@ else bin/clinotty composer create-project --repository=https://repo.magento.com/ magento/project-"${EDITION}"-edition="${VERSION}" . fi -bin/clinotty [ ! -f "./var/composer_home/auth.json" ] && bin/clinotty mkdir -p ./var/composer_home && bin/clinotty cp /var/www/.composer/auth.json ./var/composer_home/auth.json - +if [ $? != 0 ]; then + echo -e "${BLUE}Please check the installation guide at ${YELLOW}https://github.com/markshust/docker-magento#install-fails-because-project-directory-is-not-empty${BLUE} for troubleshooting.${NC}" +else + bin/clinotty [ ! -f "./var/composer_home/auth.json" ] && bin/clinotty mkdir -p ./var/composer_home && bin/clinotty cp /var/www/.composer/auth.json ./var/composer_home/auth.json +fi diff --git a/compose/bin/log b/compose/bin/log new file mode 100755 index 000000000..53ff9198d --- /dev/null +++ b/compose/bin/log @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +CONTAINER_LOG_PATH="/var/www/html/var/log/"; + +display_help() { + echo -e "Description: + Tail logs from the Magento var/log folder all and specific logs + +Usage: + bin/log + +Arguments: + specific_log_files If specific_log_files are NOT provided, show all logs. Ex: bin/log system.log cache.log + +Options: + -h, --help Display help message" +} + +generate_logs_file_path() { + local container_log_path="$1" + shift # This shifts the positional parameters to the left, so $2 becomes $1, $3 becomes $2, etc. + local log_files=("$@") + local log_file_paths=() + + for file in "${log_files[@]}"; do + log_file_paths+=("$container_log_path$file") + done + + echo "${log_file_paths[@]}" +} + +get_all_logs_file_path() { + local logs_location="$1" + + bin/docker-compose exec phpfpm ls -p "$logs_location" | grep -v '/$' | sed "s|^|$logs_location|" +} + +if [[ $1 == "-h" || $1 == "--help" ]]; then + display_help +elif [[ -z $1 ]]; then + mapfile -t all_logs_file_path < <(get_all_logs_file_path "$CONTAINER_LOG_PATH") + bin/docker-compose exec phpfpm tail -f "${all_logs_file_path[@]}" +else + mapfile -t logs_file_path < <(generate_logs_file_path "$CONTAINER_LOG_PATH" "$@") + bin/docker-compose exec phpfpm tail -f "${logs_file_path[@]}" +fi diff --git a/compose/bin/phpcbf b/compose/bin/phpcbf old mode 100644 new mode 100755 diff --git a/compose/bin/phpcs b/compose/bin/phpcs old mode 100644 new mode 100755 diff --git a/compose/bin/phpcs-json-report b/compose/bin/phpcs-json-report old mode 100644 new mode 100755 diff --git a/compose/bin/setup-pwa-studio-sampledata b/compose/bin/setup-pwa-studio-sampledata new file mode 100755 index 000000000..ead888e42 --- /dev/null +++ b/compose/bin/setup-pwa-studio-sampledata @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +set +e + +RED='\033[0;31m' +GREEN='\033[0;32m' +NC='\033[0m' + +BASE_URL=${1:-master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud} + +install_sampledata() { + echo -e "${GREEN}Setting up composer repository for Venia sample data.${NC}" + bin/composer config --no-interaction --ansi repositories.venia-sample-data composer https://repo.magento.com + + echo -e "${GREEN}Requiring Venia sample data metapackage.${NC}" + bin/composer require --no-interaction --ansi magento/venia-sample-data:* + + echo -e "${GREEN}Installing Venia sample data modules.${NC}" + bin/magento setup:upgrade + + echo -e "${GREEN}Reindexing the data from the modules.${NC}" + bin/magento indexer:reindex +} + +install_sampledata + +ENV_DIST_FILE="packages/venia-concept/.env.dist" +if [ -f "$ENV_DIST_FILE" ]; then + cp "$ENV_DIST_FILE" packages/venia-concept/.env +else + echo -e "${RED}.env.dist file not found. Continuing without copying.${NC}" +fi + +echo -e "${GREEN}Script completed successfully.${NC}" +echo "You may now access your Magento PWA Studio instance at https://${BASE_URL}/" diff --git a/compose/bin/spx b/compose/bin/spx new file mode 100755 index 000000000..df63ca610 --- /dev/null +++ b/compose/bin/spx @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +S=$(bin/clinotty cat /usr/local/etc/php/php.ini | grep -iGc 'zlib.output_compression = 1'); + +spx_status() { + if [[ $S == 1 ]]; then + echo "Output compression is enabled, so you cannot currently debug with SPX." + else + echo "Output compression is disabled, so you can currently debug with SPX." + fi +} + +spx_toggle() { + if [[ $S == 1 ]]; then + spx_enable + else + spx_disable + fi +} + +spx_enable() { + if [[ $S == 1 ]]; then + bin/root sed -i -e 's/^zlib.output_compression = 1/zlib.output_compression = 0/g' /usr/local/etc/php/php.ini + sleep 1 + bin/restart phpfpm + echo "Output compression is now disabled, so you can start debugging with SPX." + else + echo "Output compression is already disabled, so you can start debugging with SPX." + fi +} + +spx_disable() { + if [[ $S == 0 ]]; then + bin/root sed -i -e 's/^zlib.output_compression = 0/zlib.output_compression = 1/g' /usr/local/etc/php/php.ini + sleep 1 + bin/restart phpfpm + echo "Output compression is now enabled, so you can no longer debug with SPX." + else + echo "Output compression is already enabled, so you can no longer debug with SPX." + fi +} + +firstArgLetter="$(echo "$1" | head -c 1)" + +if [[ $firstArgLetter == "d" ]]; then + spx_disable +elif [[ $firstArgLetter == "e" ]]; then + spx_enable +elif [[ $firstArgLetter == "t" ]]; then + spx_toggle +elif [[ $firstArgLetter == "s" ]]; then + spx_status +else + printf "Please specify either 'disable', 'enable', 'status' or 'toggle' as an argument.\nEx: bin/spx status\n" +fi diff --git a/compose/compose.yaml b/compose/compose.yaml index c7366302e..809ba93d3 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -1,7 +1,7 @@ ## Mark Shust's Docker Configuration for Magento ## (https://github.com/markshust/docker-magento) ## -## Version 44.0.0 +## Version 45.0.0 ## To use SSH, see https://github.com/markshust/docker-magento#ssh ## Linux users, see https://github.com/markshust/docker-magento#linux @@ -32,7 +32,7 @@ services: #- "host.docker.internal:host-gateway" phpfpm: - image: markoshust/magento-php:8.2-fpm-0 + image: markoshust/magento-php:8.2-fpm-1 volumes: *appvolumes env_file: env/phpfpm.env #extra_hosts: *appextrahosts @@ -55,7 +55,7 @@ services: - "6379:6379" opensearch: - image: markoshust/magento-opensearch:2.5-0 + image: markoshust/magento-opensearch:2.5-1 ports: - "9200:9200" - "9300:9300" @@ -73,7 +73,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-0 + # image: markoshust/magento-elasticsearch:7.17-1 # ports: # - "9200:9200" # - "9300:9300" @@ -86,7 +86,7 @@ services: # - "index.blocks.read_only_allow_delete" rabbitmq: - image: markoshust/magento-rabbitmq:3.11-0 + image: markoshust/magento-rabbitmq:3.11-1 ports: - "15672:15672" - "5672:5672" diff --git a/images/elasticsearch/7.17/Dockerfile b/images/elasticsearch/7.17/Dockerfile index 7471feae8..244405d63 100644 --- a/images/elasticsearch/7.17/Dockerfile +++ b/images/elasticsearch/7.17/Dockerfile @@ -1,4 +1,4 @@ -FROM elasticsearch:7.17.7 +FROM elasticsearch:7.17.16 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install \ analysis-icu \ diff --git a/images/elasticsearch/7.16/Dockerfile b/images/elasticsearch/8.5/Dockerfile similarity index 79% rename from images/elasticsearch/7.16/Dockerfile rename to images/elasticsearch/8.5/Dockerfile index 0a9f2b736..ff00b9bd8 100644 --- a/images/elasticsearch/7.16/Dockerfile +++ b/images/elasticsearch/8.5/Dockerfile @@ -1,4 +1,4 @@ -FROM elasticsearch:7.16.3 +FROM elasticsearch:8.5.3 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install \ analysis-icu \ diff --git a/images/elasticsearch/8.7/Dockerfile b/images/elasticsearch/8.7/Dockerfile new file mode 100644 index 000000000..dd4031b2c --- /dev/null +++ b/images/elasticsearch/8.7/Dockerfile @@ -0,0 +1,5 @@ +FROM elasticsearch:8.7.1 + +RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install \ + analysis-icu \ + analysis-phonetic diff --git a/images/opensearch/2.4/Dockerfile b/images/opensearch/2.4/Dockerfile deleted file mode 100644 index cfac13d8d..000000000 --- a/images/opensearch/2.4/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM opensearchproject/opensearch:2.4.1 - -RUN /usr/share/opensearch/bin/opensearch-plugin install --batch \ - analysis-icu \ - analysis-phonetic diff --git a/images/php/8.1/Dockerfile b/images/php/8.1/Dockerfile index 5cce619c7..7baee223e 100644 --- a/images/php/8.1/Dockerfile +++ b/images/php/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-fpm-bullseye +FROM php:8.1-fpm-bookworm MAINTAINER Mark Shust ARG APP_ID=1000 @@ -34,15 +34,17 @@ RUN apt-get update && apt-get install -y \ msmtp \ nodejs \ procps \ + strace \ vim \ zip \ + zlib1g-dev \ && rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net && pecl install \ - imagick \ - redis \ + imagick-3.7.0 \ + redis-6.0.2 \ ssh2-1.3.1 \ - xdebug \ + xdebug-3.3.1 \ && pecl clear-cache \ && rm -rf /tmp/pear @@ -83,10 +85,18 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \ && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz +RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git /usr/lib/php-spx \ + && cd /usr/lib/php-spx \ + && phpize \ + && ./configure \ + && make \ + && make install + RUN curl -sS https://getcomposer.org/installer | \ php -- --install-dir=/usr/local/bin --filename=composer COPY conf/blackfire.ini $PHP_INI_DIR/conf.d/blackfire.ini +COPY conf/spx.ini $PHP_INI_DIR/conf.d/spx.ini COPY conf/msmtprc /etc/msmtprc COPY conf/php.ini $PHP_INI_DIR COPY conf/php-fpm.conf /usr/local/etc/ diff --git a/images/php/8.1/conf/php-fpm.conf b/images/php/8.1/conf/php-fpm.conf index 5e875011b..e69b8fee3 100644 --- a/images/php/8.1/conf/php-fpm.conf +++ b/images/php/8.1/conf/php-fpm.conf @@ -29,3 +29,6 @@ clear_env = no ; Ensure worker stdout and stderr are sent to the main error log. catch_workers_output = yes + +; This needed to make PHP-SPX work in fpm mode. +process.dumpable = yes diff --git a/images/php/8.1/conf/php.ini b/images/php/8.1/conf/php.ini index abede9e1c..608c5ff8e 100644 --- a/images/php/8.1/conf/php.ini +++ b/images/php/8.1/conf/php.ini @@ -1,6 +1,6 @@ memory_limit = 4G max_execution_time = 1800 -zlib.output_compression = On +zlib.output_compression = 1 cgi.fix_pathinfo = 0 date.timezone = UTC diff --git a/images/php/8.1/conf/spx.ini b/images/php/8.1/conf/spx.ini new file mode 100644 index 000000000..7422bfa9e --- /dev/null +++ b/images/php/8.1/conf/spx.ini @@ -0,0 +1,5 @@ +extension = /usr/lib/php-spx/modules/spx.so +spx.http_enabled = 1 +spx.http_key = "dev" +spx.http_ip_whitelist = "*" +spx.data_dir = /var/www/spx_dumps diff --git a/images/php/8.2/Dockerfile b/images/php/8.2/Dockerfile index f87faac79..f991fd500 100644 --- a/images/php/8.2/Dockerfile +++ b/images/php/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm-bullseye +FROM php:8.2-fpm-bookworm MAINTAINER Mark Shust ARG APP_ID=1000 @@ -8,7 +8,7 @@ RUN groupadd -g "$APP_ID" app \ RUN mkdir -p /etc/nginx/html /var/www/html /sock \ && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock -RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - RUN apt-get update && apt-get install -y \ cron \ @@ -34,15 +34,17 @@ RUN apt-get update && apt-get install -y \ msmtp \ nodejs \ procps \ + strace \ vim \ zip \ + zlib1g-dev \ && rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net && pecl install \ - imagick \ - redis \ + imagick-3.7.0 \ + redis-6.0.2 \ ssh2-1.3.1 \ - xdebug \ + xdebug-3.3.1 \ && pecl clear-cache \ && rm -rf /tmp/pear @@ -83,10 +85,18 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \ && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz +RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git /usr/lib/php-spx \ + && cd /usr/lib/php-spx \ + && phpize \ + && ./configure \ + && make \ + && make install + RUN curl -sS https://getcomposer.org/installer | \ php -- --install-dir=/usr/local/bin --filename=composer COPY conf/blackfire.ini $PHP_INI_DIR/conf.d/blackfire.ini +COPY conf/spx.ini $PHP_INI_DIR/conf.d/spx.ini COPY conf/msmtprc /etc/msmtprc COPY conf/php.ini $PHP_INI_DIR COPY conf/php-fpm.conf /usr/local/etc/ diff --git a/images/php/8.2/conf/php-fpm.conf b/images/php/8.2/conf/php-fpm.conf index 5e875011b..e69b8fee3 100644 --- a/images/php/8.2/conf/php-fpm.conf +++ b/images/php/8.2/conf/php-fpm.conf @@ -29,3 +29,6 @@ clear_env = no ; Ensure worker stdout and stderr are sent to the main error log. catch_workers_output = yes + +; This needed to make PHP-SPX work in fpm mode. +process.dumpable = yes diff --git a/images/php/8.2/conf/php.ini b/images/php/8.2/conf/php.ini index abede9e1c..608c5ff8e 100644 --- a/images/php/8.2/conf/php.ini +++ b/images/php/8.2/conf/php.ini @@ -1,6 +1,6 @@ memory_limit = 4G max_execution_time = 1800 -zlib.output_compression = On +zlib.output_compression = 1 cgi.fix_pathinfo = 0 date.timezone = UTC diff --git a/images/php/8.2/conf/spx.ini b/images/php/8.2/conf/spx.ini new file mode 100644 index 000000000..7422bfa9e --- /dev/null +++ b/images/php/8.2/conf/spx.ini @@ -0,0 +1,5 @@ +extension = /usr/lib/php-spx/modules/spx.so +spx.http_enabled = 1 +spx.http_key = "dev" +spx.http_ip_whitelist = "*" +spx.data_dir = /var/www/spx_dumps diff --git a/images/php/8.3/Dockerfile b/images/php/8.3/Dockerfile new file mode 100644 index 000000000..6295e7d61 --- /dev/null +++ b/images/php/8.3/Dockerfile @@ -0,0 +1,118 @@ +FROM php:8.3-fpm-bookworm +MAINTAINER Mark Shust + +ARG APP_ID=1000 +RUN groupadd -g "$APP_ID" app \ + && useradd -g "$APP_ID" -u "$APP_ID" -d /var/www -s /bin/bash app + +RUN mkdir -p /etc/nginx/html /var/www/html /sock \ + && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock + +RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - + +RUN apt-get update && apt-get install -y \ + cron \ + default-mysql-client \ + git \ + gnupg \ + gzip \ + libbz2-dev \ + libfreetype6-dev \ + libicu-dev \ + libjpeg62-turbo-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libonig-dev \ + libpng-dev \ + libsodium-dev \ + libssh2-1-dev \ + libwebp-dev \ + libxslt1-dev \ + libzip-dev \ + lsof \ + mailutils \ + msmtp \ + nodejs \ + procps \ + strace \ + vim \ + zip \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net && pecl install \ + redis-6.0.2 \ + ssh2-1.3.1 \ + xdebug-3.3.1 \ + && pecl clear-cache \ + && rm -rf /tmp/pear + +RUN curl -L https://github.com/Imagick/imagick/archive/28f27044e435a2b203e32675e942eb8de620ee58.zip -o imagick.zip \ + && unzip imagick.zip \ + && rm imagick.zip \ + && cd imagick-28f27044e435a2b203e32675e942eb8de620ee58 \ + && phpize \ + && ./configure --with-php-config=/usr/local/bin/php-config \ + && make \ + && make install \ + && echo "extension=imagick.so" >> $PHP_INI_DIR/conf.d/imagick.ini \ + && cd .. \ + && rm -rf imagick-28f27044e435a2b203e32675e942eb8de620ee58 + +RUN docker-php-ext-configure \ + gd --with-freetype --with-jpeg --with-webp \ + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + gd \ + gettext \ + intl \ + mbstring \ + mysqli \ + opcache \ + pcntl \ + pdo_mysql \ + soap \ + sockets \ + sodium \ + sysvmsg \ + sysvsem \ + sysvshm \ + xsl \ + zip \ + && docker-php-ext-enable \ + imagick \ + redis \ + ssh2 \ + xdebug + +RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ + && architecture=$(uname -m) \ + && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/$architecture/$version \ + && mkdir -p /tmp/blackfire \ + && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \ + && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \ + && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz + +RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git /usr/lib/php-spx \ + && cd /usr/lib/php-spx \ + && phpize \ + && ./configure \ + && make \ + && make install + +RUN curl -sS https://getcomposer.org/installer | \ + php -- --install-dir=/usr/local/bin --filename=composer + +COPY conf/blackfire.ini $PHP_INI_DIR/conf.d/blackfire.ini +COPY conf/spx.ini $PHP_INI_DIR/conf.d/spx.ini +COPY conf/msmtprc /etc/msmtprc +COPY conf/php.ini $PHP_INI_DIR +COPY conf/php-fpm.conf /usr/local/etc/ +COPY conf/www.conf /usr/local/etc/php-fpm.d/ + +USER app:app +VOLUME /var/www +WORKDIR /var/www/html diff --git a/images/php/8.3/conf/blackfire.ini b/images/php/8.3/conf/blackfire.ini new file mode 100644 index 000000000..86b377f66 --- /dev/null +++ b/images/php/8.3/conf/blackfire.ini @@ -0,0 +1,2 @@ +extension=blackfire.so +blackfire.agent_socket=tcp://blackfire:8307 diff --git a/images/php/8.3/conf/msmtprc b/images/php/8.3/conf/msmtprc new file mode 100644 index 000000000..84837e17c --- /dev/null +++ b/images/php/8.3/conf/msmtprc @@ -0,0 +1,4 @@ +account default +host mailcatcher +port 1025 +from "user@domain.com" diff --git a/images/php/8.3/conf/php-fpm.conf b/images/php/8.3/conf/php-fpm.conf new file mode 100644 index 000000000..e69b8fee3 --- /dev/null +++ b/images/php/8.3/conf/php-fpm.conf @@ -0,0 +1,34 @@ +; This file was initially adapated from the output of: (on PHP 5.6) +; grep -vE '^;|^ *$' /usr/local/etc/php-fpm.conf.default + +[global] + +error_log = /proc/self/fd/2 +daemonize = no + +[www] + +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + +;user = app +;group = app + +listen = /sock/docker.sock +listen.owner = app +listen.group = app +listen.mode = 0660 + +pm = dynamic +pm.max_children = 10 +pm.start_servers = 4 +pm.min_spare_servers = 2 +pm.max_spare_servers = 6 + +clear_env = no + +; Ensure worker stdout and stderr are sent to the main error log. +catch_workers_output = yes + +; This needed to make PHP-SPX work in fpm mode. +process.dumpable = yes diff --git a/images/php/8.3/conf/php.ini b/images/php/8.3/conf/php.ini new file mode 100644 index 000000000..608c5ff8e --- /dev/null +++ b/images/php/8.3/conf/php.ini @@ -0,0 +1,15 @@ +memory_limit = 4G +max_execution_time = 1800 +zlib.output_compression = 1 +cgi.fix_pathinfo = 0 +date.timezone = UTC + +xdebug.mode = off +xdebug.client_host = host.docker.internal +xdebug.idekey = PHPSTORM + +upload_max_filesize = 100M +post_max_size = 100M +max_input_vars = 10000 + +sendmail_path = "/usr/bin/msmtp -t" diff --git a/images/php/8.3/conf/spx.ini b/images/php/8.3/conf/spx.ini new file mode 100644 index 000000000..7422bfa9e --- /dev/null +++ b/images/php/8.3/conf/spx.ini @@ -0,0 +1,5 @@ +extension = /usr/lib/php-spx/modules/spx.so +spx.http_enabled = 1 +spx.http_key = "dev" +spx.http_ip_whitelist = "*" +spx.data_dir = /var/www/spx_dumps diff --git a/images/php/8.3/conf/www.conf b/images/php/8.3/conf/www.conf new file mode 100644 index 000000000..af0053704 --- /dev/null +++ b/images/php/8.3/conf/www.conf @@ -0,0 +1,413 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'access.log' +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or NONE) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = app +group = app + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. +; Default Value: 511 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 511 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0660 +;listen.owner = www-data +;listen.group = www-data +;listen.mode = 0660 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 5 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: /usr/local/share/php/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 .php7 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/local) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/lib/onelinesetup b/lib/onelinesetup index 1d76ba343..d802f4593 100755 --- a/lib/onelinesetup +++ b/lib/onelinesetup @@ -2,7 +2,7 @@ set -o errexit DOMAIN=${1:-magento.test} -VERSION=${2:-2.4.6-p3} +VERSION=${2:-2.4.6-p4} EDITION=${3:-community} curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash