diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 1608fce8a..1b93375fc 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -104,6 +104,8 @@ class AppRequestsController extends AppController $group = ''; if(isset($data['group'])) { $group = $data['group']; + } else { + $group = Configure::read('GroupAlias'); } $requestAnswear = $this->JsonRequestClient->sendRequest(json_encode([ diff --git a/login_server/skeema/gradido_login/insert/setup_docker_group.sql b/login_server/skeema/gradido_login/insert/setup_docker_group.sql new file mode 100644 index 000000000..53a556758 --- /dev/null +++ b/login_server/skeema/gradido_login/insert/setup_docker_group.sql @@ -0,0 +1,6 @@ +INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `home`, `description`) VALUES +(2, 'docker', 'docker gradido group', 'localhost', '/', 'gradido test group for docker and stage2 with blockchain db'); + + + + diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index d88257a8e..abfc45d1d 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -13,6 +13,7 @@ COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql # login server db COPY ./login_server/skeema/ . RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; sed -i '1i use gradido_login;' "../b_$f"; done +RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c_$f"; sed -i '1i use gradido_login;' "../../c_$f"; done # community server db COPY ./community_server/skeema/ . RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed -i '1i use gradido_community;' "../d_$f"; done