Merge pull request #1004 from piotrkwiecinski/platform-updates

.github/workflows/build-opensearch-1.2.yml

@@ -1,34 +0,0 @@
-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-2.4.yml

@@ -1,33 +0,0 @@
-name: build-opensearch-2.4
-
-on: workflow_dispatch
-
-jobs:
-  opensearch-2-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/opensearch/2.4
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            markoshust/magento-opensearch:2.4-develop

.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

.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

.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

.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

compose/compose.commerce246beta.yaml

@@ -1,121 +0,0 @@
-## Mark Shust's Docker Configuration for Magento
-## (https://github.com/markshust/docker-magento)
-##
-## Version 44.0.0
-
-## To use SSH, see https://github.com/markshust/docker-magento#ssh
-## Linux users, see https://github.com/markshust/docker-magento#linux
-
-## If you changed the default Docker network, you may need to replace
-## 172.17.0.1 in this file with the result of:
-## docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}'
-
-version: "3"
-
-services:
-  app:
-    image: markoshust/magento-nginx:1.18-8
-    ports:
-      - "80:8000"
-      - "443:8443"
-    volumes: &appvolumes
-      - ~/.composer:/var/www/.composer:cached
-      - ~/.ssh/id_rsa:/var/www/.ssh/id_rsa:cached
-      - ~/.ssh/known_hosts:/var/www/.ssh/known_hosts:cached
-      - appdata:/var/www/html
-      - sockdata:/sock
-      - ssldata:/etc/nginx/certs
-    #extra_hosts: &appextrahosts
-      ## Selenium support, replace "magento.test" with URL of your site
-      #- "magento.test:172.17.0.1"
-      ## Linux, uncomment for Xdebug capabilities:
-      #- "host.docker.internal:host-gateway"
-
-  phpfpm:
-    image: markoshust/magento-php:8.2-fpm-develop
-    volumes: *appvolumes
-    env_file: env/phpfpm.env
-    #extra_hosts: *appextrahosts
-
-  db:
-    image: mariadb:10.6
-    command:
-      --max_allowed_packet=64M
-      --optimizer_use_condition_selectivity=1
-      --optimizer_switch="rowid_filter=off"
-    ports:
-      - "3306:3306"
-    env_file: env/db.env
-    volumes:
-      - dbdata:/var/lib/mysql
-
-  redis:
-    image: redis:7.0-alpine
-    ports:
-      - "6379:6379"
-
-  opensearch:
-    image: markoshust/magento-opensearch:2.4-develop
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    env_file: env/opensearch.env
-    environment:
-      - "discovery.type=single-node"
-      ## Avoid test failures due to small disks
-      ## More info at https://github.com/markshust/docker-magento/issues/488
-      - "cluster.routing.allocation.disk.threshold_enabled=false"
-      - "index.blocks.read_only_allow_delete"
-
-  ## If you wish to use Elasticsearch, comment out opensearch image above and
-  ## uncomment this block. Do the same in the composer.healthcheck.yaml file.
-  # Additionally, if you are performing the manual setup, you will need to
-  # 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:8.4-develop
-  #  ports:
-  #    - "9200:9200"
-  #    - "9300:9300"
-  #  env_file: env/elasticsearch.env
-  #  environment:
-  #    - "discovery.type=single-node"
-  #    ## Avoid test failures due to small disks
-  #    ## More info at https://github.com/markshust/docker-magento/issues/488
-  #    - "cluster.routing.allocation.disk.threshold_enabled=false"
-  #    - "index.blocks.read_only_allow_delete"
-
-  rabbitmq:
-    image: markoshust/magento-rabbitmq:3.9-0
-    ports:
-      - "15672:15672"
-      - "5672:5672"
-    volumes:
-      - rabbitmqdata:/var/lib/rabbitmq
-    env_file: env/rabbitmq.env
-
-  mailcatcher:
-    image: sj26/mailcatcher
-    ports:
-      - "1080:1080"
-
-  ## Blackfire support, uncomment to enable
-  #blackfire:
-  #  image: blackfire/blackfire:2
-  #  ports:
-  #    - "8307"
-  #  env_file: env/blackfire.env
-
-  ## Selenium support, uncomment to enable
-  #selenium:
-  #  image: selenium/standalone-chrome-debug:3.8.1
-  #  ports:
-  #    - "5900:5900"
-  #  extra_hosts: *appextrahosts
-
-volumes:
-  appdata:
-  dbdata:
-  rabbitmqdata:
-  sockdata:
-  ssldata:

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"

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

images/rabbitmq/3.11/Dockerfile

@@ -0,0 +1,3 @@
+FROM rabbitmq:3.11-management-alpine
+
+COPY conf/rabbitmq.conf /etc/rabbitmq/rabbitmq.conf

images/rabbitmq/3.11/conf/rabbitmq.conf

@@ -0,0 +1 @@
+vm_memory_high_watermark.absolute = 1GB