From 88704aa12865ce752289d2bd0c3c97242ab434d4 Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Mon, 21 Jun 2021 17:37:10 +0200 Subject: [PATCH 1/3] small syntax fix --- data/sql/ClusterCockpit.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/ClusterCockpit.sql b/data/sql/ClusterCockpit.sql index 586f155..736a2f4 100644 --- a/data/sql/ClusterCockpit.sql +++ b/data/sql/ClusterCockpit.sql @@ -2072,7 +2072,7 @@ INSERT INTO `job` (`id`, `job_id`, `user_id`, `cluster_id`, `num_nodes`, `start_ (1965, '7374389.wadm1', 'woodyUser1', 'woody', 1, 1608263342, 5699, 'w1549', 0, 0, '', 'project11', 6.78, 2.7, 5.93, 0, 0, 0), (1966, '7376912.wadm1', 'woodyUser1', 'woody', 1, 1609154522, 3120, 'w1512', 0, 0, '', 'project11', 0.41, 0, 0.16, 0, 0, 0), (1967, '7377047.wadm1', 'woodyUser1', 'woody', 1, 1609161001, 1800, 'w1160', 0, 0, '', 'project11', 0.32, 0, 0.14, 0, 0, 0), -(1968, '7377101.wadm1', 'woodyUser1', 'woody', 1, 1609160701, 2460, 'w1113', 0, 0, '', 'project11', 0.31, 0, 0.12, 0, 0, 0); +(1968, '7377101.wadm1', 'woodyUser1', 'woody', 1, 1609160701, 2460, 'w1113', 0, 0, '', 'project11', 0.31, 0, 0.12, 0, 0, 0), (1969, '7378658.wadm1', 'woodyUser8', 'woody', 1, 1609942921, 84241, 'w1168', 0, 0, '', 'no project', 0.26, 0, 0, 1.03, 0, 0), (1970, '7379420.wadm1', 'woodyUser8', 'woody', 1, 1610025901, 86460, 'w1139', 0, 0, '', 'no project', 0.28, 0, 0, 1.03, 0, 0), (1971, '7381537.wadm1', 'woodyUser6', 'woody', 1, 1610359262, 86459, 'w1111', 0, 0, '', 'no project', 5.23, 0, 0.02, 4.21, 0, 0), From efda9acc9bb29d24e866fc23b1fc1f8abb352178 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 22 Jun 2021 13:36:08 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 56fcc5e..4571cba 100644 --- a/README.md +++ b/README.md @@ -55,13 +55,15 @@ To reuse an existing Symfony tree at `./data/symfony` you may change the environ * By default, this also uses prepared fixture data for databases. In order to use an existing database, changes in `.env` and `docker-compose.yml` are required (see below). ### Setup +This description assumes you will let the docker setup initialize the symfony tree and data fixtures for you. If not using an existing database, the fixture data needs to be prepared before the first start of the containers: * `$ cd data` -* `$ ./init.sh` +* `$ ./init.sh dev` + In `.env`, change the following variables under `APP` * `APP_ENVIRONMENT` to `dev` -After that from the root of the repository you can start up the containers with: +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 @@ -69,7 +71,7 @@ After the initial setup you have to: * Comment or delete the line `- ${DATADIR}/sql:/docker-entrypoint-initdb.d` for `cc-db` to disable initialisation of the MySQL database. * Set `APP_CLUSTERCOCKPIT_INIT` to `false` in the .env file -On subsequent start of the containers you will then use the persisted volume data located in the `./data` directory. +On subsequent start of the containers you will then reuse the persisted volume data located in the `./data` directory. By default, you can access ClusterCockpit in your browser at `http://localhost`. If `NGINX_PORT` environment variable was changed, `use http://localhost:$PORT`. @@ -80,4 +82,4 @@ If default database fixture were used, the credentials for admin user are: * User: `admin` * Password: `AdminDev` -You can shutdown the containers by pressing `CTRL-C`. +You can shutdown the containers by pressing `CTRL-C` if not started in detached mode. From 6d6f046ec2c52ba2ed74fc69e65b69883d918141 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Tue, 22 Jun 2021 13:37:35 +0200 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4571cba..8034a15 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ This is a setup for `docker compose` to try out a complete ClusterCockpit Applic It creates containers for: * mysql -* influxdb * php-fpm * nginx +* influxdb (only in dev mode) * phpmyadmin (only in dev mode) Ports and Passwords are configured in `.env`.