diff --git a/Dockerfile b/Dockerfile index 5a1caabdb..0525e5b39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,16 +21,16 @@ RUN cp .env.example .env \ && rm .env \ && chown -R nginx:nginx . && chmod -R 777 storage/* bootstrap/cache -RUN cp .dev/docker/default.conf /etc/nginx/conf.d/default.conf \ - && cat .dev/docker/www.conf > /usr/local/etc/php-fpm.d/www.conf \ +RUN cp docker/default.conf /etc/nginx/conf.d/default.conf \ + && cat docker/www.conf > /usr/local/etc/php-fpm.d/www.conf \ && rm /usr/local/etc/php-fpm.d/www.conf.default \ - && cat .dev/docker/supervisord.conf > /etc/supervisord.conf \ + && cat docker/supervisord.conf > /etc/supervisord.conf \ && echo "* * * * * /usr/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \ && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \ && mkdir -p /var/run/php /var/run/nginx EXPOSE 80 443 -ENTRYPOINT ["/bin/ash", ".dev/docker/entrypoint.sh"] +ENTRYPOINT ["/bin/ash", "docker/entrypoint.sh"] CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ] \ No newline at end of file diff --git a/.dev/docker/README.md b/docker/README.md similarity index 100% rename from .dev/docker/README.md rename to docker/README.md diff --git a/.dev/docker/default.conf b/docker/default.conf similarity index 100% rename from .dev/docker/default.conf rename to docker/default.conf diff --git a/.dev/docker/default_ssl.conf b/docker/default_ssl.conf similarity index 100% rename from .dev/docker/default_ssl.conf rename to docker/default_ssl.conf diff --git a/.dev/docker/entrypoint.sh b/docker/entrypoint.sh similarity index 94% rename from .dev/docker/entrypoint.sh rename to docker/entrypoint.sh index d353b9a69..84cf19576 100644 --- a/.dev/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -41,10 +41,10 @@ else echo "Checking if letsencrypt email is set." if [ -z $LE_EMAIL ]; then echo "No letsencrypt email is set using http config." - cp .dev/docker/default.conf /etc/nginx/conf.d/default.conf + cp docker/default.conf /etc/nginx/conf.d/default.conf else echo "writing ssl config" - cp .dev/docker/default_ssl.conf /etc/nginx/conf.d/default.conf + cp docker/default_ssl.conf /etc/nginx/conf.d/default.conf echo "updating ssl config for domain" sed -i "s||$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf echo "generating certs" diff --git a/.dev/docker/supervisord.conf b/docker/supervisord.conf similarity index 100% rename from .dev/docker/supervisord.conf rename to docker/supervisord.conf diff --git a/.dev/docker/www.conf b/docker/www.conf similarity index 100% rename from .dev/docker/www.conf rename to docker/www.conf