move docker foler

move docker folder from .dev/

update Dockerfile and entrypoint scripts to match

Author: parkervcp

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" ]

.dev/docker/README.md docker/README.md.dev/docker/README.md renamed to docker/README.md

@@ -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|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf
     echo "generating certs"