ClusterCockpit/cc-docker
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-docker.git synced 2024-11-10 08:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

New environment variables for JWT keys

Browse Source
This commit is contained in:
Lou Knauer 2021-09-21 15:07:42 +02:00
parent 562c8ac71d
commit 3ae494f316
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -5,6 +5,8 @@ CLUSTERCOCKPIT_BRANCH=develop
APP_CLUSTERCOCKPIT_INIT=true APP_CLUSTERCOCKPIT_INIT=true
APP_ENVIRONMENT=dev APP_ENVIRONMENT=dev
APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629 APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629
APP_JWT_PRIV_KEY="dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q=="
APP_JWT_PUB_KEY="kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0="
######################################################################## ########################################################################
# PHP # PHP

2
docker-compose.yml
View File

@ -73,6 +73,8 @@ services:
environment: environment:
- APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT} - APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT}
- CLUSTERCOCKPIT_BRANCH=${CLUSTERCOCKPIT_BRANCH} - CLUSTERCOCKPIT_BRANCH=${CLUSTERCOCKPIT_BRANCH}
- APP_JWT_PUB_KEY=${APP_JWT_PUB_KEY}
- APP_JWT_PRIV_KEY=${APP_JWT_PRIV_KEY}
volumes: volumes:
- ${DATADIR}/symfony:/var/www/symfony:cached - ${DATADIR}/symfony:/var/www/symfony:cached
- ${DATADIR}/job-archive:/var/lib/job-archive:cached - ${DATADIR}/job-archive:/var/lib/job-archive:cached

2
nginx/nginx.conf
View File

@ -38,9 +38,9 @@ http {
error_log off; error_log off;
gzip on; gzip on;
gzip_disable "MSIE [1-6]\.";
gzip_comp_level 9; gzip_comp_level 9;
gzip_min_length 200; gzip_min_length 200;
gzip_types text/plain text/html text/css application/json;
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
} }

2
php-fpm/Dockerfile
View File

@ -60,6 +60,8 @@ RUN chmod +x /entrypoint.sh
ARG APP_ENVIRONMENT ARG APP_ENVIRONMENT
ENV APP_ENV=${APP_ENVIRONMENT} ENV APP_ENV=${APP_ENVIRONMENT}
ENV APP_SECRET=${APP_SECRET} ENV APP_SECRET=${APP_SECRET}
ENV APP_JWT_PUB_KEY="${APP_JWT_PUB_KEY}"
ENV APP_JWT_PRIV_KEY="${APP_JWT_PRIV_KEY}"
ENV APP_DEBUG=1 ENV APP_DEBUG=1
ENV REDIS_URL=redis://cc-redis ENV REDIS_URL=redis://cc-redis
ENV LDAP_URL=ldap://cc-ldap ENV LDAP_URL=ldap://cc-ldap

2
php-fpm/symfony.pool.conf
View File

@ -76,6 +76,8 @@ pm.max_spare_servers = 3
; Make specific Docker environment variables available to PHP ; Make specific Docker environment variables available to PHP
env[APP_ENV] = $APP_ENV env[APP_ENV] = $APP_ENV
env[APP_SECRET] = $APP_SECRET env[APP_SECRET] = $APP_SECRET
env[APP_JWT_PUB_KEY] = $APP_JWT_PUB_KEY
env[APP_JWT_PRIV_KEY] = $APP_JWT_PRIV_KEY
env[APP_DEBUG] = $APP_DEBUG env[APP_DEBUG] = $APP_DEBUG
env[INFLUXDB_URL] = $INFLUXDB_URL env[INFLUXDB_URL] = $INFLUXDB_URL
env[INFLUXDB_TOKEN] = $INFLUXDB_TOKEN env[INFLUXDB_TOKEN] = $INFLUXDB_TOKEN