From 13889ae92da010e24072cd98031d26cbeb8357f4 Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Thu, 25 Nov 2021 09:04:58 +0100
Subject: [PATCH 1/2] Change settings for stable support

* Checkout main branch.
* Download _stable versions of Fixture data.
---
 .env         |  2 +-
 data/init.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index 8ccd36e..ce1d1fe 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 ########################################################################
 # CLUSTERCOCKPIT SETTINGS
 ########################################################################
-CLUSTERCOCKPIT_BRANCH=develop
+CLUSTERCOCKPIT_BRANCH=main
 APP_CLUSTERCOCKPIT_INIT=true
 APP_ENVIRONMENT=dev
 APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629
diff --git a/data/init.sh b/data/init.sh
index 25e3f3f..3bddade 100755
--- a/data/init.sh
+++ b/data/init.sh
@@ -18,9 +18,9 @@ if [ -d symfony ]; then
 fi
 
 mkdir symfony
-wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive.tar.xz
-tar xJf job-archive.tar.xz
-rm ./job-archive.tar.xz
+wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive_stable.tar.xz
+tar xJf job-archive_stable.tar.xz
+rm ./job-archive_stable.tar.xz
 
 # 101 is the uid and gid of the user and group www-data in the cc-php container running php-fpm.
 # For a demo with no new jobs it is enough to give www read permissions on that directory.
@@ -28,7 +28,7 @@ rm ./job-archive.tar.xz
 # sudo chown -R 82:82 ./job-archive
 
 mkdir -p influxdb/data
-wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/influxdbv2-data.tar.xz
+wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/influxdbv2-data_stable.tar.xz
 cd influxdb/data
-tar xJf ../../influxdbv2-data.tar.xz
-rm ../../influxdbv2-data.tar.xz
+tar xJf ../../influxdbv2-data_stable.tar.xz
+rm ../../influxdbv2-data_stable.tar.xz

From d80cb7d723643fc035d39b653355ecc97538e5f7 Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Thu, 25 Nov 2021 09:27:32 +0100
Subject: [PATCH 2/2] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba12b9e..65c255e 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,11 @@ The setup comes with fixture data for a Job archive, InfluxDB, MySQL, and a LDAP
 
 ## Configuration
 
+The main branch of this repository will work with the latest ClusterCockpit release (main branch) including the fixture data.
+For ClusterCockpit development on the develop branch use the cc-docker develop branch.
+
 While many aspects of this docker compose setup can be configured you usually only need to adapt the following three settings in `.env`:
-* `CLUSTERCOCKPIT_BRANCH` (Default: `develop`): The branch to checkout from ClusterCockpit git repository. May also be a tag.
+* `CLUSTERCOCKPIT_BRANCH`: The branch to checkout from ClusterCockpit git repository. May also be a tag. This should not be changed as it may be that the fixture data may not be compatible between stable and develop.
 * `APP_CLUSTERCOCKPIT_INIT` (Default: true): Wether the Symfony tree (located at `./data/symfony`) should be deleted and freshly cloned and initialized on every container startup.
 * `APP_ENVIRONMENT` (Default: `dev`): The Symfony app environment. With `dev` you get the symfony debug toolbar and more extensive error handling. The `prod` environment is a setup for productions use.