From 29aa1f2d40b5825ed1ad6a4eb3f2ad01951b6ab1 Mon Sep 17 00:00:00 2001 From: eroncero Date: Mon, 18 Aug 2025 16:33:16 +0200 Subject: [PATCH] General fixes --- mariadb-srv/project/entrypoint/entrypoint.sh | 6 ++--- multi-php-fpm-srv/Dockerfile | 1 + .../project/entrypoint/copy-config.sh | 4 ++++ .../project/entrypoint/entrypoint.sh | 1 + nginx-srv/www/html/index.nginx-debian.html | 23 +++++++++++++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 multi-php-fpm-srv/project/entrypoint/copy-config.sh create mode 100644 nginx-srv/www/html/index.nginx-debian.html diff --git a/mariadb-srv/project/entrypoint/entrypoint.sh b/mariadb-srv/project/entrypoint/entrypoint.sh index 78ed7cf..f1550dc 100644 --- a/mariadb-srv/project/entrypoint/entrypoint.sh +++ b/mariadb-srv/project/entrypoint/entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/sh -chown -R mysql:mysql /run/mysql -chown -R mysql:mysql /var/lib/mysql - /bin/sh /entrypoint/install-packages.sh +chown -R mysql:mysql /run/mysqld +chown -R mysql:mysql /var/lib/mysql + service mariadb start # Run the CMD that was passed (or default) diff --git a/multi-php-fpm-srv/Dockerfile b/multi-php-fpm-srv/Dockerfile index 0b6ef74..951e1c0 100644 --- a/multi-php-fpm-srv/Dockerfile +++ b/multi-php-fpm-srv/Dockerfile @@ -14,6 +14,7 @@ RUN /bin/sh /tmp/buildtime/buildtime_php_ver_inst.sh ENV DEF_PHP_INTERPRETER="8.2" COPY project/entrypoint/entrypoint.sh /entrypoint/entrypoint.sh +COPY project/entrypoint/copy-config.sh /entrypoint/copy-config.sh COPY project/entrypoint/container-php-ver-inst.sh /entrypoint/container-php-ver-inst.sh COPY project/entrypoint/install-php-versions.sh /entrypoint/install-php-versions.sh COPY project/entrypoint/start-php-fpm.sh /entrypoint/start-php-fpm.sh diff --git a/multi-php-fpm-srv/project/entrypoint/copy-config.sh b/multi-php-fpm-srv/project/entrypoint/copy-config.sh new file mode 100644 index 0000000..ad1f9c4 --- /dev/null +++ b/multi-php-fpm-srv/project/entrypoint/copy-config.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Copy all .conf files from source to destination +cp /mnt/place-config/etc/php/8.2/fpm/pool.d/*.conf /etc/php/8.2/fpm/pool.d/ diff --git a/multi-php-fpm-srv/project/entrypoint/entrypoint.sh b/multi-php-fpm-srv/project/entrypoint/entrypoint.sh index d568454..d04e44a 100644 --- a/multi-php-fpm-srv/project/entrypoint/entrypoint.sh +++ b/multi-php-fpm-srv/project/entrypoint/entrypoint.sh @@ -2,6 +2,7 @@ /bin/sh /entrypoint/container-php-ver-inst.sh /bin/sh /entrypoint/install-php-versions.sh +/bin/sh /entrypoint/copy-config.sh /bin/sh /entrypoint/start-php-fpm.sh diff --git a/nginx-srv/www/html/index.nginx-debian.html b/nginx-srv/www/html/index.nginx-debian.html new file mode 100644 index 0000000..e8f5622 --- /dev/null +++ b/nginx-srv/www/html/index.nginx-debian.html @@ -0,0 +1,23 @@ + + + +Welcome to nginx! + + + +

Welcome to nginx!

+

If you see this page, the nginx web server is successfully installed and +working. Further configuration is required.

+ +

For online documentation and support please refer to +nginx.org.
+Commercial support is available at +nginx.com.

+ +

Thank you for using nginx.

+ +