Move files used for Docker into dedicated directory

range-of-motion · Oct 30, 2023 · e7b29d3 · e7b29d3
1 parent a37d285
commit e7b29d3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,9 @@ services:
       retries: 5
 
   app:
-    build: ./
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
     depends_on:
       database:
         condition: service_healthy

diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
@@ -12,13 +12,10 @@ RUN apt-get update && \
       supervisor
 
 # Configure NGINX
-COPY nginx.conf /etc/nginx/sites-enabled/default
+COPY docker/nginx.conf /etc/nginx/sites-enabled/default
 
 # Configure cron
-COPY cron.conf /etc/cron.d/budget
-
-# Configure Supervisor
-COPY supervisord.conf /etc/supervisor/conf.d/budget.conf
+COPY docker/cron.conf /etc/cron.d/budget
 
 # Install PHP extensions
 RUN install-php-extensions pdo_mysql zip calendar gd
@@ -45,4 +42,4 @@ RUN php artisan storage:link
 
 RUN chown -R www-data:www-data /var/www
 
-ENTRYPOINT ["/var/www/entrypoint.sh"]
+ENTRYPOINT ["/var/www/docker/entrypoint.sh"]
diff --git a/cron.conf → docker/cron.conf b/cron.conf → docker/cron.conf
diff --git a/entrypoint.sh → docker/entrypoint.sh b/entrypoint.sh → docker/entrypoint.sh
@@ -10,6 +10,6 @@ php artisan config:cache
 
 php artisan migrate --force
 
-supervisord -n -c supervisord.conf
+supervisord -n -c docker/supervisord.conf
 
 exec "$@"
diff --git a/nginx.conf → docker/nginx.conf b/nginx.conf → docker/nginx.conf
diff --git a/supervisord.conf → docker/supervisord.conf b/supervisord.conf → docker/supervisord.conf