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

README.md

@@ -7,15 +7,10 @@ It creates containers for:
 * php-fpm
 * nginx
 * influxdb (only in dev mode)
-* phpmyadmin (only in dev mode)
+* phpmyadmin (only in dev mode), this did not work with Chrome for me.
 
 Ports and Passwords are configured in `.env`.
 
-TODOS (There are probably a lot more!):
-* Some of the Volume directories need to be created first.
-* ClusterCockpit is at the moment still using the influxDB V1 API, the InfluxDB container is already V2
-* For a complete demo database setup, InfluxDB data fixtures are missing (MySQL demo database is available)
-
 ## Known Issues
 
 * `docker-compose` installed on Ubuntu (18.04, 20.04) via `apt-get` can not correctly parse `docker-compose.yml` due to version differences. Install latest version of `docker-compose` from https://docs.docker.com/compose/install/ instead.
@@ -63,6 +58,17 @@ If not using an existing database, the fixture data needs to be prepared before
 In `.env`, change the following variables under `APP`
 * `APP_ENVIRONMENT` to `dev`
 
+In case you want to switch from Demo to Develop you have to purge previous images. This command will purge **ALL** your docker images:
+```
+$ docker images -a -q | xargs docker rmi -f
+```
+
+Check with:
+```
+$ docker images
+```
+that all images are gone.
+
 After that from the root of the repository you can start up the containers with (use -d switch to startup in detached mode):
 * `docker-compose -f docker-compose.yml -f docker-compose-dev.yml up`
 * Wait... and wait a little longer

data/init.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 mkdir symfony
-wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive.tar.bz2
-tar xjf job-archive.tar.bz2
-rm ./job-archive.tar.bz2
+wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive.tar.xz
+tar xJf job-archive.tar.bz2
+rm ./job-archive.tar.xz
 
 if [ $# -gt 0 ]; then
     if [ $1 == "dev" ]; then

docker-compose.yml

@@ -33,7 +33,6 @@ services:
           - ${DATADIR}/job-archive:/var/lib/job-archive:cached
         depends_on:
             - db
-            - influxdb
 
     nginx:
         container_name: cc-nginx