Merge pull request #219 from dbarzin/main

Rebase
dbarzin · Nov 10, 2024 · 33a6e48 · 33a6e48
2 parents 592ffc9 + fb376af
commit 33a6e48
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 50 deletions.
diff --git a/custom/.env b/custom/.env
diff --git a/docker/Dockerfile_web b/docker/Dockerfile_web
@@ -2,7 +2,7 @@ FROM --platform=amd64 nginx:bookworm
 
 RUN apt update && apt dist-upgrade -y
 RUN apt-get install -y --no-install-recommends \
-    git=1:2.39.2-* \
+    git=1:2.39.5-* \
     composer=2.5.5-* \
     php=2:8.2* \
     php-cli=2:8.2* \
@@ -14,6 +14,7 @@ RUN apt-get install -y --no-install-recommends \
     php-mbstring=2:8.2* \
     php-curl=2:8.2* \
     php-xml=2:8.2* \
+    mariadb-server \
     postfix \
     mailutils \
     cron \

diff --git a/custom/Kernel.php → docker/custom/Kernel.php b/custom/Kernel.php → docker/custom/Kernel.php
diff --git a/custom/app.php → docker/custom/app.php b/custom/app.php → docker/custom/app.php
diff --git a/custom/custom_postfix_mailname → docker/custom/custom_postfix_mailname b/custom/custom_postfix_mailname → docker/custom/custom_postfix_mailname
diff --git a/custom/custom_postfix_main.cf → docker/custom/custom_postfix_main.cf b/custom/custom_postfix_main.cf → docker/custom/custom_postfix_main.cf
diff --git a/custom/deming.php → docker/custom/deming.php b/custom/deming.php → docker/custom/deming.php
diff --git a/docker/entrypoint.sh → docker/docker/entrypoint.sh b/docker/entrypoint.sh → docker/docker/entrypoint.sh
diff --git a/docker/initialdb.sh → docker/docker/initialdb.sh b/docker/initialdb.sh → docker/docker/initialdb.sh
diff --git a/docker/resetdb.sh → docker/docker/resetdb.sh b/docker/resetdb.sh → docker/docker/resetdb.sh