From a93a73ef4dea7382ac43d3bac21f75f1e544cbb0 Mon Sep 17 00:00:00 2001 From: Asherslab Date: Fri, 18 May 2018 09:11:33 -0400 Subject: [PATCH] Moved files --- default.conf => .dev/default.conf | 0 entrypoint.sh => .dev/entrypoint.sh | 2 ++ Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename default.conf => .dev/default.conf (100%) rename entrypoint.sh => .dev/entrypoint.sh (98%) diff --git a/default.conf b/.dev/default.conf similarity index 100% rename from default.conf rename to .dev/default.conf diff --git a/entrypoint.sh b/.dev/entrypoint.sh similarity index 98% rename from entrypoint.sh rename to .dev/entrypoint.sh index 8a42015e0..eeb416ce0 100644 --- a/entrypoint.sh +++ b/.dev/entrypoint.sh @@ -1,4 +1,6 @@ #!/bin/ash +cd /app + tini -- php-fpm until nc -z -v -w30 $DB_HOST 3306 diff --git a/Dockerfile b/Dockerfile index ef05f6da5..94817bdb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apk add --no-cache wget ca-certificates && \ COPY . ./ -COPY default.conf /etc/nginx/conf.d/default.conf +COPY .dev/default.conf /etc/nginx/conf.d/default.conf RUN cp .env.example .env RUN composer install --no-dev @@ -21,5 +21,5 @@ EXPOSE 443 RUN chown -R www-data:www-data . RUN chmod -R 777 storage/* bootstrap/cache /var/run/php -ENTRYPOINT ["ash", "entrypoint.sh"] +ENTRYPOINT ["ash", ".dev/entrypoint.sh"]