diff --git a/Dockerfile b/Dockerfile index 557dbd3..b866d03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ FROM php:8.1.7-fpm -ENV WORKDIR=/var/www/html -ENV STORAGE_DIR=${WORKDIR}/storage +ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} -ENV LARAVEL_PROCS_NUMBER=2 +ENV LARAVEL_PROCS_NUMBER=1 ENV DOMAIN=_ ENV CLIENT_MAX_BODY_SIZE=15M # Install system dependencies @@ -71,13 +70,13 @@ RUN composer global require "laravel/envoy=~1.0" # Set working directory WORKDIR $WORKDIR -# nginx site conf RUN rm -Rf /var/www/* && \ -mkdir /var/www/html/ +mkdir -p /var/www/html ADD src/index.php $WORKDIR/index.php ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default ADD src/php.ini $PHP_INI_DIR/conf.d/ +ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf COPY ./entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh @@ -93,4 +92,6 @@ RUN groupmod -g 1000 www-data RUN chmod -R 755 $WORKDIR RUN chown -R www-data:www-data $WORKDIR EXPOSE 9000 +EXPOSE 80 CMD [ "entrypoint" ] + diff --git a/README.md b/README.md index 012e4f9..e77829b 100644 --- a/README.md +++ b/README.md @@ -50,13 +50,11 @@ services: ## Laravel `artisan` command usage: ### CLI ```sh -docker-compose exec app bash +docker-compose exec app bash ``` - -### Laravel migration ```sh -php atisan migrate +docker exec -it app bash ``` @@ -67,8 +65,7 @@ version: '3' services: app: image: jkaninda/nginx-php-fpm - container_name: my-app - working_dir: /var/www/html #Optional, If you want to use a custom directory + container_name: nginx-fpm restart: unless-stopped ports: - "80:80" @@ -76,15 +73,14 @@ services: #Project root - ./:/var/www/html - ~/.ssh:/root/.ssh # If you use private CVS - - #./php.ini:/usr/local/etc/php/conf.d/php.ini # Optional, your custom php init file - - storage-data:/var/www/html/storage/app #Optional, your custom storage data + #./php.ini:/usr/local/etc/php/conf.d/php.ini # Optional, your custom php init file environment: - APP_ENV=development # Optional, or production - - LARAVEL_PROCS_NUMBER=3 # Optional, Laravel queue:work process number - - CLIENT_MAX_BODY_SIZE=20M # Optional - - DOMAIN=example.com # Optional -volumes: - storage-data: + - LARAVEL_PROCS_NUMBER=2 # Optional, Laravel queue:work process number + #- CLIENT_MAX_BODY_SIZE=20M # Optional + #- DOMAIN=example.com # Optional + #- DOCUMENT_ROOT=/var/www/html Optional + ``` ## Docker run diff --git a/entrypoint.sh b/entrypoint.sh index d11339b..bb29dfc 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,25 +8,11 @@ echo "***********************************************************" set -e -## Create PHP-FPM worker process -TASK=/etc/supervisor/conf.d/php-fpm.conf -touch $TASK -cat > "$TASK" < "$TASK" <