diff --git a/deploy/Dockerfile b/deploy/Dockerfile deleted file mode 100644 index 47bc55b..0000000 --- a/deploy/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM git.php.fail/lubiana/container/php:8.3 as phpbuild - diff --git a/deploy/etc/php83/php-fpm.d/www.conf b/deploy/etc/php83/php-fpm.d/www.conf index 113b8c2..edf975a 100644 --- a/deploy/etc/php83/php-fpm.d/www.conf +++ b/deploy/etc/php83/php-fpm.d/www.conf @@ -7,4 +7,8 @@ pm = dynamic pm.max_children = 5 pm.start_servers = 2 pm.min_spare_servers = 1 -pm.max_spare_servers = 3 \ No newline at end of file +pm.max_spare_servers = 3 +env[APP_ENV]=$APP_ENV +env[APP_SECRET]=$APP_SECRET +error_log = /var/log/php-fpm.log +catch_workers_output = yes \ No newline at end of file diff --git a/deploy/prepare-deploy.sh b/deploy/prepare-deploy.sh old mode 100644 new mode 100755 index 53f4e46..d8c92fa --- a/deploy/prepare-deploy.sh +++ b/deploy/prepare-deploy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -TARGETDIR='futtern-app' +TARGETDIR='deploy/futtern-app' if [ -d $TARGETDIR ]; then rm -rf $TARGETDIR @@ -8,7 +8,7 @@ fi mkdir $TARGETDIR cd $TARGETDIR || return -pathsToCopy="public bin config migrations src templates composer.json composer.lock symfony.lock .env etc" +pathsToCopy="public bin config migrations src templates composer.json composer.lock symfony.lock .env" for path in $pathsToCopy do