Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move files used for Docker into dedicated directory #437

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ services:
retries: 5

app:
build: ./
build:
context: .
dockerfile: docker/Dockerfile
depends_on:
database:
condition: service_healthy
Expand Down
9 changes: 3 additions & 6 deletions Dockerfile → docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
File renamed without changes.
2 changes: 1 addition & 1 deletion entrypoint.sh → docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ php artisan config:cache

php artisan migrate --force

supervisord -n -c supervisord.conf
supervisord -n -c docker/supervisord.conf

exec "$@"
File renamed without changes.
File renamed without changes.