Update version constraints to match current Magento system requirements #994

.github/workflows/build-elasticsearch-7.17.yml → .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

.github/workflows/build-elasticsearch-8.4.yml → .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

.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

.github/workflows/build-elasticsearch.yml

@@ -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

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

@@ -1,4 +1,4 @@
-name: build-nginx
+name: build-nginx-1-18
 
 on: workflow_dispatch
 

.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

.github/workflows/build-opensearch.yml → .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

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

@@ -1,4 +1,4 @@
-name: build-php-8.1
+name: build-php-8-1
 
 on: workflow_dispatch
 

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

@@ -1,4 +1,4 @@
-name: build-php-8.2
+name: build-php-8-2
 
 on: workflow_dispatch
 

.github/workflows/build-php.yml

@@ -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

.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

.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

.github/workflows/build-rabbitmq.yml

@@ -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

.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

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)
 

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"

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 \

images/elasticsearch/7.16/Dockerfile → 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 \

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

images/opensearch/2.4/Dockerfile

@@ -1,5 +0,0 @@
-FROM opensearchproject/opensearch:2.4.1
-
-RUN /usr/share/opensearch/bin/opensearch-plugin install --batch \
-  analysis-icu \
-  analysis-phonetic