From b22f0efbe53dab72df0e8695105e1ef626b4065c Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sun, 19 Sep 2021 07:32:37 +0200 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c46a34..00d312a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ It includes the following containers: * phpmyadmin Settings are configured in `.env`. -The setup comes with fixture data for a job archive, influxDB, mySQL, and a LDAP user directory. +The setup comes with fixture data for a Job archive, InfluxDB, MySQL, and a LDAP user directory. ## Known Issues From 33317afe5e9c0728851f359eaed5d0bfb21118cc Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sun, 19 Sep 2021 08:46:02 +0200 Subject: [PATCH 2/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 00d312a..eea1006 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # cc-docker This is a `docker compose` setup to try out the complete ClusterCockpit Application Stack including all external components. This docker setup can be easily configured to be used as demo or as a development environment. +For a docker setup targeted to server environement you may have a look at https://github.com/ClusterCockpit/cc-docker-server . It includes the following containers: * mysql From 562c8ac71dd0e0849535a26c35bf03e530d08faf Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sun, 19 Sep 2021 17:08:25 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eea1006..ba12b9e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # cc-docker This is a `docker compose` setup to try out the complete ClusterCockpit Application Stack including all external components. This docker setup can be easily configured to be used as demo or as a development environment. -For a docker setup targeted to server environement you may have a look at https://github.com/ClusterCockpit/cc-docker-server . +For a docker setup targeted to server environment you may have a look at https://github.com/ClusterCockpit/cc-docker-server . It includes the following containers: * mysql From 3ae494f316e7d5e983a042abd21fedeec789243d Mon Sep 17 00:00:00 2001 From: Lou Knauer Date: Tue, 21 Sep 2021 15:07:42 +0200 Subject: [PATCH 4/4] New environment variables for JWT keys --- .env | 2 ++ docker-compose.yml | 2 ++ nginx/nginx.conf | 2 +- php-fpm/Dockerfile | 2 ++ php-fpm/symfony.pool.conf | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.env b/.env index a8a6668..3159c33 100644 --- a/.env +++ b/.env @@ -5,6 +5,8 @@ CLUSTERCOCKPIT_BRANCH=develop APP_CLUSTERCOCKPIT_INIT=true APP_ENVIRONMENT=dev APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629 +APP_JWT_PRIV_KEY="dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q==" +APP_JWT_PUB_KEY="kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0=" ######################################################################## # PHP diff --git a/docker-compose.yml b/docker-compose.yml index d6bf881..17b7d9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,6 +73,8 @@ services: environment: - APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT} - CLUSTERCOCKPIT_BRANCH=${CLUSTERCOCKPIT_BRANCH} + - APP_JWT_PUB_KEY=${APP_JWT_PUB_KEY} + - APP_JWT_PRIV_KEY=${APP_JWT_PRIV_KEY} volumes: - ${DATADIR}/symfony:/var/www/symfony:cached - ${DATADIR}/job-archive:/var/lib/job-archive:cached diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 037c8f5..9a52efc 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -38,9 +38,9 @@ http { error_log off; gzip on; - gzip_disable "MSIE [1-6]\."; gzip_comp_level 9; gzip_min_length 200; + gzip_types text/plain text/html text/css application/json; include /etc/nginx/conf.d/*.conf; } diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index bc11674..838309b 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -60,6 +60,8 @@ RUN chmod +x /entrypoint.sh ARG APP_ENVIRONMENT ENV APP_ENV=${APP_ENVIRONMENT} 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 REDIS_URL=redis://cc-redis ENV LDAP_URL=ldap://cc-ldap diff --git a/php-fpm/symfony.pool.conf b/php-fpm/symfony.pool.conf index 0848d81..d777104 100644 --- a/php-fpm/symfony.pool.conf +++ b/php-fpm/symfony.pool.conf @@ -76,6 +76,8 @@ pm.max_spare_servers = 3 ; Make specific Docker environment variables available to PHP env[APP_ENV] = $APP_ENV 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[INFLUXDB_URL] = $INFLUXDB_URL env[INFLUXDB_TOKEN] = $INFLUXDB_TOKEN