From d29e9aceec508f45f40c464e05f78cf84508fcc9 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 21 May 2021 08:08:04 +0200 Subject: [PATCH] Fix errors. Add Symfony entrypoint. --- docker-compose.yml | 2 ++ nginx/Dockerfile | 15 +++++++++------ nginx/nginx.conf | 1 - ...ymfony.conf.template => default.conf.template} | 0 php-fpm/Dockerfile | 4 +++- php-fpm/entrypoint.sh | 7 +++---- php-fpm/symfony.pool.conf | 9 ++++++--- 7 files changed, 23 insertions(+), 15 deletions(-) rename nginx/templates/{symfony.conf.template => default.conf.template} (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 6940d5f..f89979e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,8 @@ services: context: ./nginx args: NGINX_SYMFONY_SERVER_NAME: ${NGINX_SYMFONY_SERVER_NAME} + MYSQL_PASSWORD: ${MYSQL_PASSWORD} + INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD} ports: - "${NGINX_PORT}:80" depends_on: diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 3ffd6fd..663b511 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -2,17 +2,20 @@ FROM nginx:1.19.6 LABEL maintainer="Vincent Composieux " -RUN mkdir -p /etc/nginx/templates \ - mkdir -p /tmp/nginx +RUN mkdir -p /etc/nginx/templates COPY nginx.conf /etc/nginx/ COPY templates/* /etc/nginx/templates/ -COPY html/index.html.template /tmp/nginx/ ARG NGINX_SYMFONY_SERVER_NAME -ARG KIBANA_PORT -RUN envsubst < /tmp/nginx/index.html.template > /usr/share/nginx/html/index.html; \ - rm -fR /tmp/nginx +ENV APP_ENV=prod +ENV APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629 +ENV APP_DEBUG=1 +ARG INFLUXDB_PASSWORD +ARG MYSQL_PASSWORD +ENV INFLUXDB_URL=influxdb://symfony:${INFLUXDB_PASSWORD}@influxdb:8086/ClusterCockpit +ENV DATABASE_URL=mysql://symfony:${MYSQL_PASSWORD}@db:3306/ClusterCockpit +ENV CORS_ALLOW_ORIGIN=^https?://(localhost|127\\.0\\.0\\.1)(:[0-9]+)?$ CMD ["nginx"] diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 9514032..0bcf975 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -22,7 +22,6 @@ http { gzip on; gzip_disable "msie6"; include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; open_file_cache max=100; client_body_temp_path /tmp 1 2; client_body_buffer_size 256k; diff --git a/nginx/templates/symfony.conf.template b/nginx/templates/default.conf.template similarity index 100% rename from nginx/templates/symfony.conf.template rename to nginx/templates/default.conf.template diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index ae3cde7..22b4f61 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -77,13 +77,15 @@ COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENV APP_ENV=prod -ENV APP_DEBUG=0 +ENV APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629 +ENV APP_DEBUG=1 ARG INFLUXDB_PASSWORD ARG MYSQL_PASSWORD ENV INFLUXDB_URL=influxdb://symfony:${INFLUXDB_PASSWORD}@influxdb:8086/ClusterCockpit ENV DATABASE_URL=mysql://symfony:${MYSQL_PASSWORD}@db:3306/ClusterCockpit ENV CORS_ALLOW_ORIGIN=^https?://(localhost|127\\.0\\.0\\.1)(:[0-9]+)?$ +WORKDIR /var/www/symfony EXPOSE 9001 CMD ["php-fpm8", "-F"] ENTRYPOINT ["/entrypoint.sh"] diff --git a/php-fpm/entrypoint.sh b/php-fpm/entrypoint.sh index 70f1dd5..ca61659 100755 --- a/php-fpm/entrypoint.sh +++ b/php-fpm/entrypoint.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash rm -rf /var/www/symfony/* /var/www/symfony/.* -# git clone https://github.com/ClusterCockpit/ClusterCockpit.git /var/www/symfony/. - cd /var/www/symfony git init @@ -12,7 +10,8 @@ git checkout feature-47-introduce-graphql-api composer install --no-dev --no-progress --optimize-autoloader yarn install yarn encore production -# bin/console doc:mig:mig --no-interaction -# bin/console doc:fix:load --no-interaction +# php bin/console doctrine:schema:create --no-interaction +#php bin/console doctrine:migrations:migrate --no-interaction +#php bin/console doc:fix:load --no-interaction exec "$@" diff --git a/php-fpm/symfony.pool.conf b/php-fpm/symfony.pool.conf index c0bb18e..8157ab7 100644 --- a/php-fpm/symfony.pool.conf +++ b/php-fpm/symfony.pool.conf @@ -74,8 +74,11 @@ pm.max_spare_servers = 3 ;--------------------- ; Make specific Docker environment variables available to PHP -env[DB_1_ENV_MYSQL_DATABASE] = $DB_1_ENV_MYSQL_DATABASE -env[DB_1_ENV_MYSQL_USER] = $DB_1_ENV_MYSQL_USER -env[DB_1_ENV_MYSQL_PASSWORD] = $DB_1_ENV_MYSQL_PASSWORD +env[APP_ENV] = $APP_ENV +env[APP_SECRET] = $APP_SECRET +env[APP_DEBUG] = $APP_DEBUG +env[INFLUXDB_URL] = $INFLUXDB_URL +env[DATABASE_URL] = $DATABASE_URL +env[CORS_ALLOW_ORIGIN] = $CORS_ALLOW_ORIGIN catch_workers_output = yes