From a50eadfab801afe9eea5e8ce4a7aa94687c289a2 Mon Sep 17 00:00:00 2001
From: eroncero <eroncero>
Date: Tue, 5 Aug 2025 14:49:08 +0200
Subject: [PATCH] Install stuff after the container is created

---
 docker-compose.yaml                           |  6 +++---
 mariadb-srv/Dockerfile                        | 11 ++++-------
 mariadb-srv/project/entrypoint/entrypoint.sh  |  4 +---
 mariadb-srv/project/entrypoint/fix_volumes.sh | 18 ------------------
 4 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 mariadb-srv/project/entrypoint/fix_volumes.sh

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5f43e2c..7c8c74a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   nginx-srv:
-    image: eroncero/nginx-srv:latest
+    image: eroncero/nginx-srv:beta
     build:
       context: ./nginx-srv
       dockerfile: Dockerfile
@@ -18,7 +18,7 @@ services:
       - ./nginx-srv/etc/letsencrypt:/etc/letsencrypt
 
   multi-php-fpm:
-    image: eroncero/multi-php-fpm
+    image: eroncero/multi-php-fpm:latest
     build:
       context: ./multi-php-fpm
       dockerfile: Dockerfile
@@ -32,7 +32,7 @@ services:
       - ./mariadb-srv/run/mysql:/run/mysqld
 
   mariadb-srv:
-    image: eroncero/mariadb-srv:latest
+    image: eroncero/mariadb-srv:beta
     build:
       context: ./mariadb-srv
       dockerfile: Dockerfile
diff --git a/mariadb-srv/Dockerfile b/mariadb-srv/Dockerfile
index 122c656..6b45b0b 100644
--- a/mariadb-srv/Dockerfile
+++ b/mariadb-srv/Dockerfile
@@ -1,13 +1,10 @@
 FROM debian:bookworm
 
-ARG DEBIAN_FRONTEND=noninteractive
-ARG DEBCONF_NONINTERACTIVE_SEEN=true
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN=true
 
-RUN apt-get update; apt-get full-upgrade -y; apt-get autoclean -y; apt-get install mariadb-server mariadb-client iputils-ping -y
+RUN apt-get update; apt-get full-upgrade -y; apt-get autoclean -y; apt-get install mariadb-server mariadb-client iputils-ping -y --download-only
 
 COPY project/entrypoint/entrypoint.sh /entrypoint/entrypoint.sh
-COPY project/entrypoint/fix_volumes.sh /entrypoint/fix_volumes.sh
-#COPY project/entrypoint/gen-cert.sh /entrypoint/gen-cert.sh
-RUN mkdir -p /tmp/buildtime/etc/mysql && cp -r /etc/mysql/. /tmp/buildtime/etc/mysql/
-RUN mkdir -p /tmp/buildtime/var/lib/mysql && cp -r /var/lib/mysql/. /tmp/buildtime/var/lib/mysql/
+
 ENTRYPOINT ["/bin/sh", "/entrypoint/entrypoint.sh"]
diff --git a/mariadb-srv/project/entrypoint/entrypoint.sh b/mariadb-srv/project/entrypoint/entrypoint.sh
index 1b87ba5..d362bb0 100644
--- a/mariadb-srv/project/entrypoint/entrypoint.sh
+++ b/mariadb-srv/project/entrypoint/entrypoint.sh
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-/bin/sh /entrypoint/fix_volumes.sh
-
 service mariadb start
 # Run the CMD that was passed (or default)
-#exec "$@"
+exec "$@"
 
 tail -f /dev/null
 
diff --git a/mariadb-srv/project/entrypoint/fix_volumes.sh b/mariadb-srv/project/entrypoint/fix_volumes.sh
deleted file mode 100644
index e740c7b..0000000
--- a/mariadb-srv/project/entrypoint/fix_volumes.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-#mkdir -p /etc/mysql  # Creates /etc/php if it doesn't exist
-#mkdir -p /var/lib/mysql  # Creates /etc/php if it doesn't exist
-[ -d "/etc/mysql" ] || mkdir -p /etc/mysql
-[ -d "/var/lib/mysql" ] || mkdir -p /var/lib/mysql
-
-if [ ! -f /etc/mysql/my.cnf ]; then
-  cp -a /tmp/buildtime/etc/mysql/* /etc/mysql/
-  rm -rf /tmp/buildtime/etc/mysql/
-fi
-
-if [ "$(ls -A /var/lib/mysql)" ]; then
-	cp -a /tmp/buildtime/var/lib/mysql/* /var/lib/mysql #&& rm -rf /tmp/buildtime/var/lib/mysql
-fi
-
-chown -R mysql:mysql /var/lib/mysql
-chown -R mysql:root /run/mysqld