Przeglądaj źródła

Update all packages to support latest versions for Magento 2.4.7 #1108

Mark Shust 1 rok temu
rodzic
commit
2385779ef4

+ 34 - 0
.github/workflows/build-elasticsearch-7-16.yml

@@ -0,0 +1,34 @@
+name: build-elasticsearch-7-16
+
+on: workflow_dispatch
+
+jobs:
+  elasticsearch-7-17:
+    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/7.17
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-elasticsearch:7.16
+            markoshust/magento-elasticsearch:7.16-0

+ 34 - 0
.github/workflows/build-elasticsearch-8-11.yml

@@ -0,0 +1,34 @@
+name: build-elasticsearch-8-11
+
+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.11
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-elasticsearch:8.11
+            markoshust/magento-elasticsearch:8.11-0

+ 34 - 0
.github/workflows/build-elasticsearch-8-13.yml

@@ -0,0 +1,34 @@
+name: build-elasticsearch-8-13
+
+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.13
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-elasticsearch:8.13
+            markoshust/magento-elasticsearch:8.13-0

+ 34 - 0
.github/workflows/build-elasticsearch-8-7.yml

@@ -0,0 +1,34 @@
+name: build-elasticsearch-8-7
+
+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.7
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-elasticsearch:8.7
+            markoshust/magento-elasticsearch:8.7-0

+ 34 - 0
.github/workflows/build-nginx-1-22.yml

@@ -0,0 +1,34 @@
+name: build-nginx-1-22
+
+on: workflow_dispatch
+
+jobs:
+  nginx-1-18:
+    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/nginx/1.22
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-nginx:1.22
+            markoshust/magento-nginx:1.22-0

+ 34 - 0
.github/workflows/build-nginx-1-24.yml

@@ -0,0 +1,34 @@
+name: build-nginx-1-24
+
+on: workflow_dispatch
+
+jobs:
+  nginx-1-18:
+    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/nginx/1.24
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-nginx:1.24
+            markoshust/magento-nginx:1.24-0

+ 34 - 0
.github/workflows/build-opensearch-2-12.yml

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

+ 1 - 1
.github/workflows/build-php-8-1.yml

@@ -31,4 +31,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.1-fpm
-            markoshust/magento-php:8.1-fpm-3
+            markoshust/magento-php:8.1-fpm-4

+ 1 - 1
.github/workflows/build-php-8-2.yml

@@ -31,4 +31,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.2-fpm
-            markoshust/magento-php:8.2-fpm-2
+            markoshust/magento-php:8.2-fpm-3

+ 1 - 1
.github/workflows/build-php-8-3.yml

@@ -31,4 +31,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.3-fpm
-            markoshust/magento-php:8.3-fpm-develop
+            markoshust/magento-php:8.3-fpm-0

+ 34 - 0
.github/workflows/build-rabbitmq-3-12.yml

@@ -0,0 +1,34 @@
+name: build-rabbitmq-3-12
+
+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.12
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            markoshust/magento-rabbitmq:3.12
+            markoshust/magento-rabbitmq:3.12-0

+ 34 - 0
.github/workflows/build-rabbitmq-3-8.yml

@@ -0,0 +1,34 @@
+name: build-rabbitmq-3-8
+
+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.8
+            markoshust/magento-rabbitmq:3.8-0

+ 13 - 5
README.md

@@ -29,21 +29,29 @@ 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)
+  - [`1.22`, `1.22-0`](images/nginx/1.22)
+  - [`1.24`, `1.24-0`](images/nginx/1.24)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
-  - [`8.1-fpm`, `8.1-fpm-3`](images/php/8.1)
-  - [`8.2-fpm`, `8.2-fpm-2`](images/php/8.2)
-  - [`8.3-fpm`, `8.3-fpm-develop`](images/php/8.3)
+  - [`8.1-fpm`, `8.1-fpm-4`](images/php/8.1)
+  - [`8.2-fpm`, `8.2-fpm-3`](images/php/8.2)
+  - [`8.3-fpm`, `8.3-fpm-0`](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.5`, `2.5-1`](images/opensearch/2.5)
+  - [`1.2`, `1.2-0`](images/opensearch/1.2)
+  - [`2.5`, `2.5-1`](images/opensearch/2.5)
+  - [`2.12`, `2.12-0`](images/opensearch/2.12)
 - [markoshust/magento-elasticsearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-elasticsearch/)
+  - [`7.16`, `7.16-0`](images/elasticsearch/7.16)
   - [`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)
+  - [`8.11`, `8.11-0`](images/elasticsearch/8.11)
+  - [`8.13`, `8.13-0`](images/elasticsearch/8.13)
 - [markoshust/magento-rabbitmq (Docker Hub)](https://hub.docker.com/r/markoshust/magento-rabbitmq/)
+  - [`3.8`, `3.8-0`](images/rabbitmq/3.8)
   - [`3.9`, `3.9-0`](images/rabbitmq/3.9)
   - [`3.11`, `3.11-1`](images/rabbitmq/3.11)
+  - [`3.12`, `3.12-0`](images/rabbitmq/3.12)
 - [markoshust/ssh (Docker Hub)](https://hub.docker.com/r/markoshust/magento-ssh/)
   - [`latest`](images/ssh)
 

+ 5 - 0
images/elasticsearch/7.16/Dockerfile

@@ -0,0 +1,5 @@
+FROM elasticsearch:7.16.3
+
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install \
+  analysis-icu \
+  analysis-phonetic

+ 5 - 0
images/elasticsearch/8.11/Dockerfile

@@ -0,0 +1,5 @@
+FROM elasticsearch:8.11.4
+
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install \
+  analysis-icu \
+  analysis-phonetic

+ 5 - 0
images/elasticsearch/8.13/Dockerfile

@@ -0,0 +1,5 @@
+FROM elasticsearch:8.13.0
+
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install \
+  analysis-icu \
+  analysis-phonetic

+ 37 - 0
images/nginx/1.22/Dockerfile

@@ -0,0 +1,37 @@
+FROM nginx:1.22-alpine
+MAINTAINER Mark Shust <mark@shust.com>
+
+ARG APP_ID=1000
+
+RUN addgroup -g "$APP_ID" app \
+ && adduser -G app -u "$APP_ID" -h /var/www -s /bin/bash -S app
+RUN touch /var/run/nginx.pid
+RUN mkdir /sock
+
+RUN apk add --no-cache \
+  curl \
+  nss-tools \
+  openssl
+
+RUN mkdir /etc/nginx/certs \
+  && echo -e "\n\n\n\n\n\n\n" | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/certs/nginx.key -out /etc/nginx/certs/nginx.crt
+
+ARG TARGETARCH
+
+RUN cd /usr/local/bin/ \
+  && curl -L https://github.com/FiloSottile/mkcert/releases/download/v1.4.3/mkcert-v1.4.3-linux-$TARGETARCH -o mkcert \
+  && chmod +x mkcert
+
+COPY ./conf/nginx.conf /etc/nginx/
+COPY ./conf/default.conf /etc/nginx/conf.d/
+
+RUN mkdir -p /etc/nginx/html /var/www/html \
+  && chown -R app:app /etc/nginx /var/www /var/cache/nginx /var/run/nginx.pid /sock
+
+EXPOSE 8443
+
+USER app:app
+
+VOLUME /var/www
+
+WORKDIR /var/www/html

+ 35 - 0
images/nginx/1.22/conf/default.conf

@@ -0,0 +1,35 @@
+upstream fastcgi_backend {
+  server unix:/sock/docker.sock;
+}
+
+server {
+  listen 8000;
+  return 301 https://$host$request_uri;
+}
+
+server {
+  listen [::]:8443 ssl http2 ipv6only=on;
+  listen 8443 ssl http2;
+
+  ssl_certificate /etc/nginx/certs/nginx.crt;
+  ssl_certificate_key /etc/nginx/certs/nginx.key;
+
+  set $MAGE_ROOT /var/www/html;
+
+  fastcgi_buffer_size 64k;
+  fastcgi_buffers 8 128k;
+
+  location /livereload.js {
+    proxy_set_header Host $host;
+    proxy_pass http://phpfpm:35729/livereload.js;
+  }
+
+  location /livereload {
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+    proxy_pass http://phpfpm:35729/livereload;
+  }
+
+  include /var/www/html/nginx[.]conf;
+}

+ 35 - 0
images/nginx/1.22/conf/default.magento1.conf

@@ -0,0 +1,35 @@
+upstream fastcgi_backend {
+  server unix:/sock/docker.sock;
+}
+
+server {
+  listen 8000;
+  server_name localhost;
+
+  set $MAGE_ROOT /var/www/html;
+  set $MAGE_IS_DEVELOPER_MODE true;
+
+  root $MAGE_ROOT;
+
+  index index.php;
+  autoindex off;
+  charset off;
+
+  add_header 'X-Content-Type-Options' 'nosniff';
+
+  location / {
+    try_files $uri $uri/ /index.php?$args;
+  }
+  
+  location ~ cron\.php {
+    deny all;
+  }
+
+  location ~* \.php$ {
+    try_files $uri =404;
+    fastcgi_pass fastcgi_backend;
+    fastcgi_index index.php;
+    fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+    include fastcgi_params;
+  }
+}

+ 36 - 0
images/nginx/1.22/conf/nginx.conf

@@ -0,0 +1,36 @@
+# let's assume dual-core machine
+worker_processes 2;
+
+error_log /var/log/nginx/error.log debug;
+pid /var/run/nginx.pid;
+
+load_module /etc/nginx/modules/ngx_http_image_filter_module.so;
+
+events {
+  # this should be equal to value of "ulimit -n"
+  # reference: https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
+  worker_connections 1048576;
+}
+
+http {
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  log_format main
+    '$remote_addr - $remote_user [$time_local] "$request" '
+    '$status $body_bytes_sent "$http_referer" '
+    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  access_log /var/log/nginx/access.log main;
+
+  sendfile on;
+  #tcp_nopush on;
+
+  keepalive_timeout 65;
+
+  #gzip on;
+
+  client_max_body_size 20M;
+
+  include /etc/nginx/conf.d/*.conf;
+}

+ 37 - 0
images/nginx/1.24/Dockerfile

@@ -0,0 +1,37 @@
+FROM nginx:1.24-alpine
+MAINTAINER Mark Shust <mark@shust.com>
+
+ARG APP_ID=1000
+
+RUN addgroup -g "$APP_ID" app \
+ && adduser -G app -u "$APP_ID" -h /var/www -s /bin/bash -S app
+RUN touch /var/run/nginx.pid
+RUN mkdir /sock
+
+RUN apk add --no-cache \
+  curl \
+  nss-tools \
+  openssl
+
+RUN mkdir /etc/nginx/certs \
+  && echo -e "\n\n\n\n\n\n\n" | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/certs/nginx.key -out /etc/nginx/certs/nginx.crt
+
+ARG TARGETARCH
+
+RUN cd /usr/local/bin/ \
+  && curl -L https://github.com/FiloSottile/mkcert/releases/download/v1.4.3/mkcert-v1.4.3-linux-$TARGETARCH -o mkcert \
+  && chmod +x mkcert
+
+COPY ./conf/nginx.conf /etc/nginx/
+COPY ./conf/default.conf /etc/nginx/conf.d/
+
+RUN mkdir -p /etc/nginx/html /var/www/html \
+  && chown -R app:app /etc/nginx /var/www /var/cache/nginx /var/run/nginx.pid /sock
+
+EXPOSE 8443
+
+USER app:app
+
+VOLUME /var/www
+
+WORKDIR /var/www/html

+ 35 - 0
images/nginx/1.24/conf/default.conf

@@ -0,0 +1,35 @@
+upstream fastcgi_backend {
+  server unix:/sock/docker.sock;
+}
+
+server {
+  listen 8000;
+  return 301 https://$host$request_uri;
+}
+
+server {
+  listen [::]:8443 ssl http2 ipv6only=on;
+  listen 8443 ssl http2;
+
+  ssl_certificate /etc/nginx/certs/nginx.crt;
+  ssl_certificate_key /etc/nginx/certs/nginx.key;
+
+  set $MAGE_ROOT /var/www/html;
+
+  fastcgi_buffer_size 64k;
+  fastcgi_buffers 8 128k;
+
+  location /livereload.js {
+    proxy_set_header Host $host;
+    proxy_pass http://phpfpm:35729/livereload.js;
+  }
+
+  location /livereload {
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+    proxy_pass http://phpfpm:35729/livereload;
+  }
+
+  include /var/www/html/nginx[.]conf;
+}

+ 35 - 0
images/nginx/1.24/conf/default.magento1.conf

@@ -0,0 +1,35 @@
+upstream fastcgi_backend {
+  server unix:/sock/docker.sock;
+}
+
+server {
+  listen 8000;
+  server_name localhost;
+
+  set $MAGE_ROOT /var/www/html;
+  set $MAGE_IS_DEVELOPER_MODE true;
+
+  root $MAGE_ROOT;
+
+  index index.php;
+  autoindex off;
+  charset off;
+
+  add_header 'X-Content-Type-Options' 'nosniff';
+
+  location / {
+    try_files $uri $uri/ /index.php?$args;
+  }
+  
+  location ~ cron\.php {
+    deny all;
+  }
+
+  location ~* \.php$ {
+    try_files $uri =404;
+    fastcgi_pass fastcgi_backend;
+    fastcgi_index index.php;
+    fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+    include fastcgi_params;
+  }
+}

+ 36 - 0
images/nginx/1.24/conf/nginx.conf

@@ -0,0 +1,36 @@
+# let's assume dual-core machine
+worker_processes 2;
+
+error_log /var/log/nginx/error.log debug;
+pid /var/run/nginx.pid;
+
+load_module /etc/nginx/modules/ngx_http_image_filter_module.so;
+
+events {
+  # this should be equal to value of "ulimit -n"
+  # reference: https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
+  worker_connections 1048576;
+}
+
+http {
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  log_format main
+    '$remote_addr - $remote_user [$time_local] "$request" '
+    '$status $body_bytes_sent "$http_referer" '
+    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  access_log /var/log/nginx/access.log main;
+
+  sendfile on;
+  #tcp_nopush on;
+
+  keepalive_timeout 65;
+
+  #gzip on;
+
+  client_max_body_size 20M;
+
+  include /etc/nginx/conf.d/*.conf;
+}

+ 5 - 0
images/opensearch/2.12/Dockerfile

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

+ 1 - 1
images/php/8.1/Dockerfile

@@ -93,7 +93,7 @@ RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php
     && make install
 
 RUN curl -sS https://getcomposer.org/installer | \
-  php -- --version=2.6.6 --install-dir=/usr/local/bin --filename=composer
+  php -- --version=2.2.18 --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

+ 1 - 1
images/php/8.2/Dockerfile

@@ -93,7 +93,7 @@ RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php
     && make install
 
 RUN curl -sS https://getcomposer.org/installer | \
-  php -- --version=2.6.6 --install-dir=/usr/local/bin --filename=composer
+  php -- --version=2.2.18 --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

+ 3 - 0
images/rabbitmq/3.12/Dockerfile

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

+ 1 - 0
images/rabbitmq/3.12/conf/rabbitmq.conf

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

+ 3 - 0
images/rabbitmq/3.8/Dockerfile

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

+ 1 - 0
images/rabbitmq/3.8/conf/rabbitmq.conf

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