Merge branch 'main' of github.com:ClusterCockpit/cc-docker

.env

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

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 environment you may have a look at https://github.com/ClusterCockpit/cc-docker-server .
 
 It includes the following containers:
 * mysql
@@ -12,7 +13,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
 

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

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;
 }

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

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