From 530860a04534a2d4a5b63f00431343e93ebef18b Mon Sep 17 00:00:00 2001 From: eroncero Date: Thu, 17 Jul 2025 11:10:08 +0200 Subject: [PATCH] Good --- {nginx => nginx-srv}/Dockerfile | 0 php-fpm-srv/Dockerfile | 15 +++++++ {php-fpm => php-fpm-srv}/docker-compose.yaml | 0 .../project/buildtime}/install-def-php.sh | 0 .../project/buildtime}/sury-repo.sh | 0 .../project/entrypoint}/entrypoint.sh | 3 +- .../entrypoint}/install-php-versions.sh | 0 .../project/entrypoint}/start-php-fpm.sh | 0 .../project/etc/8.2/fpm/pool.d/moodle4_5.conf | 0 .../etc/8.2/fpm/pool.d/wordpress6.conf | 0 php-fpm/Dockerfile | 19 --------- php-fpm/project/install-php8.2.sh | 42 ------------------- 12 files changed, 16 insertions(+), 63 deletions(-) rename {nginx => nginx-srv}/Dockerfile (100%) create mode 100644 php-fpm-srv/Dockerfile rename {php-fpm => php-fpm-srv}/docker-compose.yaml (100%) rename {php-fpm/project => php-fpm-srv/project/buildtime}/install-def-php.sh (100%) rename {php-fpm/project => php-fpm-srv/project/buildtime}/sury-repo.sh (100%) rename {php-fpm/project => php-fpm-srv/project/entrypoint}/entrypoint.sh (87%) rename {php-fpm/project => php-fpm-srv/project/entrypoint}/install-php-versions.sh (100%) rename {php-fpm/project => php-fpm-srv/project/entrypoint}/start-php-fpm.sh (100%) rename {php-fpm => php-fpm-srv}/project/etc/8.2/fpm/pool.d/moodle4_5.conf (100%) rename {php-fpm => php-fpm-srv}/project/etc/8.2/fpm/pool.d/wordpress6.conf (100%) delete mode 100644 php-fpm/Dockerfile delete mode 100644 php-fpm/project/install-php8.2.sh diff --git a/nginx/Dockerfile b/nginx-srv/Dockerfile similarity index 100% rename from nginx/Dockerfile rename to nginx-srv/Dockerfile diff --git a/php-fpm-srv/Dockerfile b/php-fpm-srv/Dockerfile new file mode 100644 index 0000000..51fb220 --- /dev/null +++ b/php-fpm-srv/Dockerfile @@ -0,0 +1,15 @@ +FROM debian:bookworm + +RUN apt-get update; apt-get full-upgrade -y; apt-get autoclean -y + +COPY project/buildtime/sury-repo.sh /tmp/buildtime/sury-repo.sh +RUN /bin/sh /tmp/buildtime/sury-repo.sh + +ENV DEF_PHP_VER="7.4" +COPY project/buildtime/install-def-php.sh /tmp/buildtime/install-def-php.sh +RUN /bin/sh /tmp/buildtime/install-def-php.sh + +COPY project/entrypoint/entrypoint.sh /entrypoint/entrypoint.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 +ENTRYPOINT ["/bin/sh", "/entrypoint/entrypoint.sh"] diff --git a/php-fpm/docker-compose.yaml b/php-fpm-srv/docker-compose.yaml similarity index 100% rename from php-fpm/docker-compose.yaml rename to php-fpm-srv/docker-compose.yaml diff --git a/php-fpm/project/install-def-php.sh b/php-fpm-srv/project/buildtime/install-def-php.sh similarity index 100% rename from php-fpm/project/install-def-php.sh rename to php-fpm-srv/project/buildtime/install-def-php.sh diff --git a/php-fpm/project/sury-repo.sh b/php-fpm-srv/project/buildtime/sury-repo.sh similarity index 100% rename from php-fpm/project/sury-repo.sh rename to php-fpm-srv/project/buildtime/sury-repo.sh diff --git a/php-fpm/project/entrypoint.sh b/php-fpm-srv/project/entrypoint/entrypoint.sh similarity index 87% rename from php-fpm/project/entrypoint.sh rename to php-fpm-srv/project/entrypoint/entrypoint.sh index 1112777..bf0f422 100644 --- a/php-fpm/project/entrypoint.sh +++ b/php-fpm-srv/project/entrypoint/entrypoint.sh @@ -13,8 +13,7 @@ ls -l /etc/ssl/certs/ #service php8.2-fpm start # this should be started later -/bin/sh /install-php-versions.sh -/bin/sh /tmp/install-def-php.sh +/bin/sh /entrypoint/install-php-versions.sh # Run the CMD that was passed (or default) #exec "$@" diff --git a/php-fpm/project/install-php-versions.sh b/php-fpm-srv/project/entrypoint/install-php-versions.sh similarity index 100% rename from php-fpm/project/install-php-versions.sh rename to php-fpm-srv/project/entrypoint/install-php-versions.sh diff --git a/php-fpm/project/start-php-fpm.sh b/php-fpm-srv/project/entrypoint/start-php-fpm.sh similarity index 100% rename from php-fpm/project/start-php-fpm.sh rename to php-fpm-srv/project/entrypoint/start-php-fpm.sh diff --git a/php-fpm/project/etc/8.2/fpm/pool.d/moodle4_5.conf b/php-fpm-srv/project/etc/8.2/fpm/pool.d/moodle4_5.conf similarity index 100% rename from php-fpm/project/etc/8.2/fpm/pool.d/moodle4_5.conf rename to php-fpm-srv/project/etc/8.2/fpm/pool.d/moodle4_5.conf diff --git a/php-fpm/project/etc/8.2/fpm/pool.d/wordpress6.conf b/php-fpm-srv/project/etc/8.2/fpm/pool.d/wordpress6.conf similarity index 100% rename from php-fpm/project/etc/8.2/fpm/pool.d/wordpress6.conf rename to php-fpm-srv/project/etc/8.2/fpm/pool.d/wordpress6.conf diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile deleted file mode 100644 index 579b6f9..0000000 --- a/php-fpm/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM debian:bookworm - -RUN apt-get update; apt-get full-upgrade -y; apt-get autoclean -y - -COPY project/sury-repo.sh /tmp/sury-repo.sh -COPY project/install-php8.2.sh /tmp/install-php8.2.sh -COPY project/install-php-versions.sh /install-php-versions.sh -COPY project/start-php-fpm.sh /start-php-fpm.sh -COPY project/install-def-php.sh /tmp/install-def-php.sh - -ENV DEF_PHP_VER="7.4" - -COPY project/entrypoint.sh /entrypoint.sh - -ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] - -RUN /bin/sh /tmp/sury-repo.sh - -RUN /bin/sh /tmp/install-php8.2.sh diff --git a/php-fpm/project/install-php8.2.sh b/php-fpm/project/install-php8.2.sh deleted file mode 100644 index 48b3707..0000000 --- a/php-fpm/project/install-php8.2.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -PHP_VER="8.2" - -apt-get update - -apt-get install -y \ - php$PHP_VER-fpm \ - php$PHP_VER-bcmath \ - php$PHP_VER-bz2 \ - php$PHP_VER-common \ - php$PHP_VER-curl \ - php$PHP_VER-dba \ - php$PHP_VER-enchant \ - php$PHP_VER-gd \ - php$PHP_VER-gmp \ - php$PHP_VER-http \ - php$PHP_VER-imap \ - php$PHP_VER-interbase \ - php$PHP_VER-intl \ - php$PHP_VER-ldap \ - php$PHP_VER-mbstring \ - php$PHP_VER-memcache \ - php$PHP_VER-memcached \ - php$PHP_VER-mysql \ - php$PHP_VER-odbc \ - php$PHP_VER-opcache \ - php$PHP_VER-pgsql \ - php$PHP_VER-ps \ - php$PHP_VER-pspell \ - php$PHP_VER-raphf \ - php$PHP_VER-readline \ - php$PHP_VER-snmp \ - php$PHP_VER-soap \ - php$PHP_VER-sqlite3 \ - php$PHP_VER-stomp \ - php$PHP_VER-sybase \ - php$PHP_VER-tidy \ - php$PHP_VER-xdebug \ - php$PHP_VER-xml \ - php$PHP_VER-xsl \ - php$PHP_VER-zip \