Change to single setup.

.env

@@ -1,10 +1,11 @@
 DATADIR=./data
+CLUSTERCOCKPIT_BRANCH=develop
 
 ########################################################################
 # APP
 ########################################################################
 APP_CLUSTERCOCKPIT_INIT=true
-APP_ENVIRONMENT=prod
+APP_ENVIRONMENT=dev
 
 ########################################################################
 # PHP

data/init.sh

@@ -9,6 +9,7 @@ if [ -d symfony ]; then
         rm -rf symfony
         sudo rm -rf job-archive
         rm -rf influxdb/data/*
+        rm -rf sqldata/*
         echo "done."
     else
         echo "Aborting ..."

docker-compose-dev.yml

@@ -1,47 +0,0 @@
-services:
-  db:
-    volumes:
-      - ${DATADIR}/sqldata:/var/lib/mysql
-
-  influxdb:
-    container_name: cc-influxdb
-    image: influxdb
-    command: ["--reporting-disabled"]
-    environment:
-      DOCKER_INFLUXDB_INIT_MODE: setup
-      DOCKER_INFLUXDB_INIT_USERNAME: symfony
-      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_PASSWORD}
-      DOCKER_INFLUXDB_INIT_ORG: ClusterCockpit
-      DOCKER_INFLUXDB_INIT_BUCKET: ClusterCockpit
-      DOCKER_INFLUXDB_INIT_RETENTION: 100w
-      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
-    ports:
-      - "127.0.0.1:${INFLUXDB_PORT}:8086"
-    volumes:
-      - ${DATADIR}/influxdb/data:/var/lib/influxdb2
-      - ${DATADIR}/influxdb/config:/etc/influxdb2
-
-  openldap:
-    container_name: cc-ldap
-    image: osixia/openldap:1.5.0
-    command: --copy-service --loglevel debug
-    environment:
-      - LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
-      - LDAP_ORGANISATION=${LDAP_ORGANISATION}
-      - LDAP_DOMAIN=${LDAP_DOMAIN}
-    volumes:
-      - ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
-    ports:
-      - "127.0.0.1:389:389"
-      - "127.0.0.1:636:636"
-
-  phpmyadmin:
-    container_name: cc-phpmyadmin
-    image: phpmyadmin
-    environment:
-      - PMA_HOST=cc-db
-      - PMA_USER=root
-      - PMA_PASSWORD=${MYSQL_ROOT_PASSWORD}
-    ports:
-      - "127.0.0.1:${PHPMYADMIN_PORT}:80"
-    restart: always

docker-compose.yml

@@ -10,9 +10,42 @@ services:
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
     volumes:
       - ${DATADIR}/sql-init:/docker-entrypoint-initdb.d
+      - ${DATADIR}/sqldata:/var/lib/mysql
     cap_add:
       - SYS_NICE
 
+  influxdb:
+    container_name: cc-influxdb
+    image: influxdb
+    command: ["--reporting-disabled"]
+    environment:
+      DOCKER_INFLUXDB_INIT_MODE: setup
+      DOCKER_INFLUXDB_INIT_USERNAME: symfony
+      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_PASSWORD}
+      DOCKER_INFLUXDB_INIT_ORG: ClusterCockpit
+      DOCKER_INFLUXDB_INIT_BUCKET: ClusterCockpit
+      DOCKER_INFLUXDB_INIT_RETENTION: 100w
+      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
+    ports:
+      - "127.0.0.1:${INFLUXDB_PORT}:8086"
+    volumes:
+      - ${DATADIR}/influxdb/data:/var/lib/influxdb2
+      - ${DATADIR}/influxdb/config:/etc/influxdb2
+
+  openldap:
+    container_name: cc-ldap
+    image: osixia/openldap:1.5.0
+    command: --copy-service --loglevel debug
+    environment:
+      - LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
+      - LDAP_ORGANISATION=${LDAP_ORGANISATION}
+      - LDAP_DOMAIN=${LDAP_DOMAIN}
+    volumes:
+      - ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
+    ports:
+      - "127.0.0.1:389:389"
+      - "127.0.0.1:636:636"
+
   redis:
     container_name: cc-redis
     image: redis
@@ -42,6 +75,7 @@ services:
         APP_ENVIRONMENT: ${APP_ENVIRONMENT}
     environment:
       - APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT}
+      - CLUSTERCOCKPIT_BRANCH=${CLUSTERCOCKPIT_BRANCH}
     volumes:
       - ${DATADIR}/symfony:/var/www/symfony:cached
       - ${DATADIR}/job-archive:/var/lib/job-archive:cached
@@ -69,3 +103,14 @@ services:
       - NGINX_SYMFONY_SERVER_NAME=${NGINX_SYMFONY_SERVER_NAME}
     volumes:
       - ${DATADIR}/symfony:/var/www/symfony:cached
+
+  phpmyadmin:
+    container_name: cc-phpmyadmin
+    image: phpmyadmin
+    environment:
+      - PMA_HOST=cc-db
+      - PMA_USER=root
+      - PMA_PASSWORD=${MYSQL_ROOT_PASSWORD}
+    ports:
+      - "127.0.0.1:${PHPMYADMIN_PORT}:80"
+    restart: always

php-fpm/entrypoint.sh

@@ -1,13 +1,10 @@
 #!/usr/bin/env bash
 
 if [ "$APP_CLUSTERCOCKPIT_INIT" = true ]; then
-
-
     rm -rf /var/www/symfony/* /var/www/symfony/.??*
-    git clone https://github.com/ClusterCockpit/ClusterCockpit .
+    git clone -b $CLUSTERCOCKPIT_BRANCH  https://github.com/ClusterCockpit/ClusterCockpit .
 
     if [ "$APP_ENV" = dev ]; then
-        git checkout develop
         composer install --no-progress --optimize-autoloader
         yarn install
         yarn encore dev