Merge pull request #4 from magenx/dev

update

Author: magenx

docker-compose.yml

@@ -15,9 +15,6 @@
 # [website url]: https://www.magenx.com
 #
 
-
-version: '3.9'
-
 # # ---------------------------------------------------------------------------------------------------------------------#
 #  Configure reusable arguments
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -82,8 +79,7 @@ services:
         ports:
             - "10535:9000"
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -112,8 +108,7 @@ services:
         mem_limit: 2048m
         mem_reservation: 512m
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -144,8 +139,7 @@ services:
         mem_limit: 2048m
         mem_reservation: 512m
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -172,8 +166,7 @@ services:
         mem_limit: 1024mb
         mem_reservation: 128m
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger  
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -204,8 +197,7 @@ services:
         mem_limit: 1024mb
         mem_reservation: 128m
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger           
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -237,8 +229,7 @@ services:
         mem_limit: 1024mb
         mem_reservation: 128m
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger           
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -261,8 +252,7 @@ services:
         mem_limit: 512m
         mem_reservation: 128m
         oom_kill_disable: true
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -286,8 +276,7 @@ services:
         cpu_shares: 614
         mem_limit: 1024m
         mem_reservation: 128m
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -317,8 +306,7 @@ services:
         cpu_shares: 614
         mem_limit: 2048m
         mem_reservation: 128m
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -347,9 +335,7 @@ services:
         cpu_shares: 1024
         mem_limit: 2024m
         mem_reservation: 128m
-        << : *ulimits
-        << : *cap_add
-        << : *logger
+        << : [*ulimits, *cap_add, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -386,8 +372,7 @@ services:
         cpu_shares: 614
         mem_limit: 512m
         mem_reservation: 128m
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 
@@ -411,8 +396,7 @@ services:
         cpu_shares: 614
         mem_limit: 512m
         mem_reservation: 248m
-        << : *ulimits
-        << : *logger
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -425,8 +409,7 @@ services:
             - magento:${ROOT_PATH}
             - certbot:/etc/letsencrypt
             - certbotlib:/var/lib/letsencrypt
-        << : *ulimits
-        << : *logger 
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -446,8 +429,7 @@ services:
         cpu_shares: 1024
         mem_limit: 1024m
         mem_reservation: 512m
-        << : *ulimits
-        << : *logger            
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#
@@ -471,8 +453,7 @@ services:
         cpu_shares: 1024
         mem_limit: 2048m
         mem_reservation: 512m
-        << : *ulimits
-        << : *logger            
+        << : [*ulimits, *logger]
 
 
 # # ---------------------------------------------------------------------------------------------------------------------#

mariadb/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:10.5.16-focal
+FROM mariadb:10.11.8
 
 LABEL author="admin@magenx.com"
 LABEL source="https://github.com/magenx/Magento-2-docker-configuration"

php/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:labs
-FROM alpine:3.16
+FROM alpine:3.20.0
 
 LABEL author="admin@magenx.com"
 LABEL source="https://github.com/magenx/Magento-2-docker-configuration"