From f7e4497d2012448c8973cce2efce960ff113cc19 Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Sat, 28 Mar 2026 11:52:17 +0100 Subject: [PATCH] use all those scripts in order to split code --- docker/php/Dockerfile | 11 ++--------- docker/php/entrypoint.sh | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index ff0faad..7aec8b4 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -17,16 +17,9 @@ RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY entrypoint.sh /usr/local/bin/entrypoint.sh -COPY scripts/init-dev.sh /usr/local/bin/init-dev.sh -COPY scripts/init-prod.sh /usr/local/bin/init-prod.sh -COPY scripts/wait-mariadb.sh /usr/local/bin/wait-mariadb.sh -COPY scripts/wait-typesense.sh /usr/local/bin/wait-typesense.sh +COPY scripts/*.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/entrypoint.sh \ - /usr/local/bin/init-dev.sh \ - /usr/local/bin/init-prod.sh \ - /usr/local/bin/wait-mariadb.sh \ - /usr/local/bin/wait-typesense.sh +RUN chmod +x /usr/local/bin/*.sh WORKDIR /var/www/app diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh index 1c0ec73..ae4bf21 100644 --- a/docker/php/entrypoint.sh +++ b/docker/php/entrypoint.sh @@ -1,11 +1,23 @@ #!/bin/sh set -e +. /usr/local/bin/context.sh +. /usr/local/bin/setup_git.sh +. /usr/local/bin/setup_composer.sh +. /usr/local/bin/setup_env.sh +. /usr/local/bin/setup_laravel.sh -if [ "$DEV" = 1 ]; then - /usr/local/bin/init-dev.sh -else - /usr/local/bin/init-prod.sh -fi +echo "[INIT] Starting initialization..." + +setup_git +setup_composer +setup_env + +/usr/local/bin/wait-mariadb.sh +/usr/local/bin/wait-typesense.sh + +setup_laravel + +echo "[INIT] Done ✅" exec "$@" \ No newline at end of file