Merge pull request #1004 from piotrkwiecinski/platform-updates

markshust · Nov 21, 2023 · 65e1f5a · 65e1f5a
2 parents ed64164 + a0f44cd
commit 65e1f5a
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 226 deletions.
diff --git a/.github/workflows/build-opensearch-1.2.yml b/.github/workflows/build-opensearch-1.2.yml
diff --git a/.github/workflows/build-opensearch-2.4.yml b/.github/workflows/build-opensearch-2.4.yml
diff --git a/.github/workflows/build-opensearch.yml b/.github/workflows/build-opensearch.yml
@@ -3,36 +3,7 @@ name: build-opensearch
 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
-  opensearch-2-4:
+  opensearch-2-5:
     runs-on: ubuntu-latest
     steps:
       -
@@ -59,4 +30,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            markoshust/magento-opensearch:2.4-develop
+            markoshust/magento-opensearch:2.5-0
diff --git a/.github/workflows/build-php-8.2.yml b/.github/workflows/build-php-8.2.yml
@@ -30,4 +30,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            markoshust/magento-php:8.2-fpm-develop
+            markoshust/magento-php:8.2-fpm
+            markoshust/magento-php:8.2-fpm-0
diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml
@@ -59,4 +59,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            markoshust/magento-php:8.2-fpm-develop
+            markoshust/magento-php:8.2-fpm
+            markoshust/magento-php:8.2-fpm-0
diff --git a/.github/workflows/build-rabbitmq.yml b/.github/workflows/build-rabbitmq.yml
@@ -32,3 +32,32 @@ jobs:
           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/compose/compose.commerce246beta.yaml b/compose/compose.commerce246beta.yaml
diff --git a/compose/compose.yaml b/compose/compose.yaml
@@ -32,13 +32,13 @@ services:
       #- "host.docker.internal:host-gateway"
 
   phpfpm:
-    image: markoshust/magento-php:8.1-fpm-1
+    image: markoshust/magento-php:8.2-fpm-0
     volumes: *appvolumes
     env_file: env/phpfpm.env
     #extra_hosts: *appextrahosts
 
   db:
-    image: mariadb:10.4
+    image: mariadb:10.6
     command:
       --max_allowed_packet=64M
       --optimizer_use_condition_selectivity=1
@@ -50,12 +50,12 @@ services:
       - dbdata:/var/lib/mysql
 
   redis:
-    image: redis:6.2-alpine
+    image: redis:7.0-alpine
     ports:
       - "6379:6379"
 
   opensearch:
-    image: markoshust/magento-opensearch:1.2-0
+    image: markoshust/magento-opensearch:2.5-0
     ports:
       - "9200:9200"
       - "9300:9300"
@@ -86,7 +86,7 @@ services:
   #    - "index.blocks.read_only_allow_delete"
 
   rabbitmq:
-    image: markoshust/magento-rabbitmq:3.9-0
+    image: markoshust/magento-rabbitmq:3.11-0
     ports:
       - "15672:15672"
       - "5672:5672"

diff --git a/images/opensearch/2.5/Dockerfile b/images/opensearch/2.5/Dockerfile
@@ -0,0 +1,5 @@
+FROM opensearchproject/opensearch:2.5.0
+
+RUN /usr/share/opensearch/bin/opensearch-plugin install --batch \
+  analysis-icu \
+  analysis-phonetic
diff --git a/images/rabbitmq/3.11/Dockerfile b/images/rabbitmq/3.11/Dockerfile
@@ -0,0 +1,3 @@
+FROM rabbitmq:3.11-management-alpine
+
+COPY conf/rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
diff --git a/images/rabbitmq/3.11/conf/rabbitmq.conf b/images/rabbitmq/3.11/conf/rabbitmq.conf
@@ -0,0 +1 @@
+vm_memory_high_watermark.absolute = 1GB