diff --git a/.github/workflows/build-elasticsearch-7.17.yml b/.github/workflows/build-elasticsearch-7-17.yml similarity index 90% rename from .github/workflows/build-elasticsearch-7.17.yml rename to .github/workflows/build-elasticsearch-7-17.yml index e7147f49a..a75e6d08a 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 @@ -31,4 +31,4 @@ jobs: 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 85% rename from .github/workflows/build-elasticsearch-8.4.yml rename to .github/workflows/build-elasticsearch-8-4.yml index 9c00b7e9f..c32df797c 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 @@ -30,4 +30,5 @@ jobs: 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..a8b3b52d2 --- /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@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.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 97% rename from .github/workflows/build-nginx.yml rename to .github/workflows/build-nginx-1-18.yml index 4fbb17cf7..583f0ec1b 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 diff --git a/.github/workflows/build-opensearch-1-2.yml b/.github/workflows/build-opensearch-1-2.yml new file mode 100644 index 000000000..fb0bcc3e6 --- /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@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/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 81% rename from .github/workflows/build-opensearch.yml rename to .github/workflows/build-opensearch-2-5.yml index a9b888c45..cc210c92f 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 @@ -26,8 +26,9 @@ jobs: id: docker_build uses: docker/build-push-action@v2 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 97% rename from .github/workflows/build-php-8.1.yml rename to .github/workflows/build-php-8-1.yml index 1976dc71e..38abe3032 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 diff --git a/.github/workflows/build-php-8.2.yml b/.github/workflows/build-php-8-2.yml similarity index 97% rename from .github/workflows/build-php-8.2.yml rename to .github/workflows/build-php-8-2.yml index b012d9f77..751592a09 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 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..2a7134952 --- /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@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.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..577d5b478 --- /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@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 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..03ab70063 100644 --- a/.github/workflows/build-ssh.yml +++ b/.github/workflows/build-ssh.yml @@ -26,7 +26,7 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: - context: images/php/7.3 + context: images/php/8.2 platforms: linux/amd64,linux/arm64 push: true tags: markoshust/ssh diff --git a/README.md b/README.md index 485884b80..e3d22bad9 100644 --- a/README.md +++ b/README.md @@ -31,15 +31,18 @@ View Dockerfiles for the latest tags: - [`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.2-fpm`, `8.2-fpm-0`](images/php/8.2) - [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) diff --git a/compose/compose.yaml b/compose/compose.yaml index c7366302e..2ed3528ad 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -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