ClusterCockpit/cc-docker
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-docker.git synced 2024-12-27 12:09:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change php-fpm config path. Restructure .env file

Browse Source
This commit is contained in:
Jan Eitzinger 2021-09-14 08:48:36 +02:00
parent c9c6c4353c
commit 18cd7927d3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.env
View File

@ -1,9 +1,7 @@
DATADIR=./data ########################################################################
# CLUSTERCOCKPIT SETTINGS
########################################################################
CLUSTERCOCKPIT_BRANCH=develop CLUSTERCOCKPIT_BRANCH=develop
########################################################################
# APP
########################################################################
APP_CLUSTERCOCKPIT_INIT=true APP_CLUSTERCOCKPIT_INIT=true
APP_ENVIRONMENT=dev APP_ENVIRONMENT=dev
@ -51,3 +49,8 @@ PHPMYADMIN_PORT=8080
######################################################################## ########################################################################
NGINX_PORT=80 NGINX_PORT=80
NGINX_SYMFONY_SERVER_NAME=localhost NGINX_SYMFONY_SERVER_NAME=localhost
########################################################################
# INTERNAL SETTINGS
########################################################################
DATADIR=./data

6
php-fpm/Dockerfile
View File

@ -53,7 +53,7 @@ VOLUME /var/www/symfony /var/lib/job-archive
COPY php.ini /usr/local/etc/php/ COPY php.ini /usr/local/etc/php/
COPY symfony.ini /usr/local/etc/php/conf.d/ COPY symfony.ini /usr/local/etc/php/conf.d/
COPY symfony.ini /usr/local/etc/php/cli/conf.d/ COPY symfony.ini /usr/local/etc/php/cli/conf.d/
COPY symfony.pool.conf /etc/php8/php-fpm.d/ COPY symfony.pool.conf /usr/local/etc/php/php-fpm.d/
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
@ -81,7 +81,7 @@ ENV CORS_ALLOW_ORIGIN=^https?://(localhost|127\\.0\\.0\\.1)(:[0-9]+)?$
WORKDIR /var/www/symfony WORKDIR /var/www/symfony
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]8
CMD ["php-fpm", "-F", "-y/etc/php8/php-fpm.d/symfony.pool.conf"] CMD ["php-fpm", "-F", "-y/usr/local/etc/php/php-fpm.d/symfony.pool.conf"]
EXPOSE 9001 EXPOSE 9001