diff --git a/.docker/php-fpm/Dockerfile b/.docker/php-fpm/Dockerfile index 129c95f..ace57e5 100644 --- a/.docker/php-fpm/Dockerfile +++ b/.docker/php-fpm/Dockerfile @@ -40,12 +40,15 @@ COPY database ${MASTER_DIR}/database RUN composer install --no-interaction --no-plugins --no-scripts COPY . ${MASTER_DIR} -COPY ./.docker/scripts/queuer.sh /usr/local/bin/laravel-queuer -COPY ./.docker/scripts/scheduler.sh /usr/local/bin/laravel-scheduler - -RUN chmod -R 775 /var/www/html/storage +COPY ./.docker/php-fpm/init.sh /usr/local/bin/init +COPY ./.docker/php-fpm/after.sh /usr/local/bin/after +COPY ./.docker/queuer/init.sh /usr/local/bin/laravel-queuer +COPY ./.docker/scheduler/init.sh /usr/local/bin/laravel-scheduler + +RUN chmod -R 775 ${MASTER_DIR}/storage ${MASTER_DIR}/bootstrap/cache +RUN chmod u+x /usr/local/bin/init +RUN chmod u+x /usr/local/bin/after RUN chmod u+x /usr/local/bin/laravel-queuer RUN chmod u+x /usr/local/bin/laravel-scheduler -EXPOSE 9000 -CMD ["php-fpm"] \ No newline at end of file +ENTRYPOINT ["init", "--port", "9000"] \ No newline at end of file diff --git a/.docker/php-fpm/after.sh b/.docker/php-fpm/after.sh new file mode 100644 index 0000000..74d6730 --- /dev/null +++ b/.docker/php-fpm/after.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +if [ "$PHP_ENV" != "development" ]; then + chown -R www-data /var/www/html +fi \ No newline at end of file diff --git a/.docker/php-fpm/init.sh b/.docker/php-fpm/init.sh new file mode 100644 index 0000000..d7cc492 --- /dev/null +++ b/.docker/php-fpm/init.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec php-fpm \ No newline at end of file diff --git a/.docker/scripts/queuer.sh b/.docker/queuer/init.sh similarity index 100% rename from .docker/scripts/queuer.sh rename to .docker/queuer/init.sh diff --git a/.docker/scripts/scheduler.sh b/.docker/scheduler/init.sh similarity index 100% rename from .docker/scripts/scheduler.sh rename to .docker/scheduler/init.sh diff --git a/.docker/webserver/nginx.conf.example b/.docker/webserver/nginx.conf.example index 95db0fa..e775a9a 100644 --- a/.docker/webserver/nginx.conf.example +++ b/.docker/webserver/nginx.conf.example @@ -26,7 +26,7 @@ server { server { listen 80; listen [::]:80; - server_name phpmyadmin.laravel-react-admin.test; + server_name phpmyadmin.example.com; location / { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;