From 33f9c58268a1b9c8cab7350fc9f253679b539bff Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 16:52:14 +0200 Subject: [PATCH 1/6] fix } which don't belong there --- community_server/src/Controller/AppRequestsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 37dd04d92..80cc6c202 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -317,7 +317,6 @@ class AppRequestsController extends AppController $gdtSum = intval($gdtEntries['data']['sum']); } else { $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id'] ? $user['id'] : 0); - } } From 0c68dbde9da5fd17fc060b113d7fe3b87fd6e379 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 16:56:05 +0200 Subject: [PATCH 2/6] fixing wrong var name --- frontend/src/apis/communityAPI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index 4af1ea901..d675a65bf 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -36,7 +36,7 @@ const communityAPI = { return apiGet(CONFIG.COMMUNITY_API_URL + 'getBalance/' + session_id) }, transactions: async (session_id) => { - return apiGet(CONFIG.COMMUNITY_API__URL + 'listTransactions/1/25/ASC/' + session_id) + return apiGet(CONFIG.COMMUNITY_API_URL + 'listTransactions/1/25/ASC/' + session_id) }, /*create: async (session_id, email, amount, memo, target_date = new Date() ) => { const payload = { @@ -57,7 +57,7 @@ const communityAPI = { memo, auto_sign: true, } - return apiPost(CONFIG.COMMUNITY_API__URL + 'sendCoins/', payload) + return apiPost(CONFIG.COMMUNITY_API_URL + 'sendCoins/', payload) }, } From c463a15db2a38f0b841e01fd14a29f56f2eea5f0 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 19:09:04 +0200 Subject: [PATCH 3/6] use again prebuild dependencies, but with code mounted from filesystem --- docker-compose.override.yml | 4 +-- login_server/Dockerfile.debug | 34 +++++++++++++++-------- login_server/Dockerfiles/build_and_run.sh | 13 +++++++++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b3c399d3a..44299b54c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -34,7 +34,7 @@ services: - ./logs:/var/log/grd_login - ./login_server/src:/code/src - ./configs/login_server:/etc/grd_login - - login_build:/code/build + - login_build_conan:/code/build_vol - conan:/root/.conan @@ -100,6 +100,6 @@ services: volumes: frontend_node_modules: - login_build: + login_build_conan: conan: diff --git a/login_server/Dockerfile.debug b/login_server/Dockerfile.debug index bb65996fb..f1b235e4e 100644 --- a/login_server/Dockerfile.debug +++ b/login_server/Dockerfile.debug @@ -1,32 +1,42 @@ ######################################################################################################### -# debug build preparation +# Build debug ######################################################################################################### -From conanio/gcc9 as build_debug_preparation -USER root +From gradido/login_dependencies:stage2 as debug ENV DOCKER_WORKDIR="/code" - -RUN mkdir -p ${DOCKER_WORKDIR} + +USER root + WORKDIR ${DOCKER_WORKDIR} +COPY . . -COPY . . +RUN chmod +x unix_parse_proto.sh +RUN chmod +x compile_pot.sh + +RUN ./compile_pot.sh +RUN ./unix_parse_proto.sh -RUN cd dependencies/mariadb-connector-c && \ - mkdir build && \ - cd build && \ - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF .. ######################################################################################################### # run debug ######################################################################################################### -FROM build_debug_preparation as login_server_debug +FROM debug as login_server_debug ENV DOCKER_WORKDIR="/code" +#RUN apt-get update && \ +# apt-get install -y --no-install-recommends gdb && \ +# apt-get autoclean && \ +# apt-get autoremove && \ +# apt-get clean && \ +# rm -rf /var/lib/apt/lists/* + +VOLUME /var/log/grd_login +VOLUME /code/src EXPOSE 1200 EXPOSE 1201 WORKDIR ${DOCKER_WORKDIR} RUN chmod +x ./Dockerfiles/build_and_run.sh -CMD ./Dockerfiles/build_and_run.sh; ./build/bin/Gradido_LoginServer +CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer diff --git a/login_server/Dockerfiles/build_and_run.sh b/login_server/Dockerfiles/build_and_run.sh index e18dcd17d..d5ea45235 100644 --- a/login_server/Dockerfiles/build_and_run.sh +++ b/login_server/Dockerfiles/build_and_run.sh @@ -1,5 +1,17 @@ #!/bin/bash +cp build/conan* build_vol/ +cd build_vol + +cmake -DCMAKE_BUILD_TYPE=Debug .. +cmake .. +make -j$(nproc) Gradido_LoginServer +#echo "building done" +chmod +x ./bin/Gradido_LoginServer +#./bin/Gradido_LoginServer + + +: ' cd build conan install .. --build=missing -s build_type=Debug cmake -DCMAKE_BUILD_TYPE=Debug .. @@ -21,3 +33,4 @@ make -j$(nproc) Gradido_LoginServer #echo "building done" chmod +x ./bin/Gradido_LoginServer #./bin/Gradido_LoginServer +' From c458e226fb12ca3e12603edf77bc33d565e63ac2 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 19:10:06 +0200 Subject: [PATCH 4/6] remove conan volume because no used here --- docker-compose.override.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 44299b54c..5a505478b 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -35,7 +35,6 @@ services: - ./login_server/src:/code/src - ./configs/login_server:/etc/grd_login - login_build_conan:/code/build_vol - - conan:/root/.conan ######################################################### @@ -101,5 +100,4 @@ services: volumes: frontend_node_modules: login_build_conan: - conan: From c704ca1a95b0bd00aa1b02fbb073709db957819b Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Thu, 22 Apr 2021 20:06:04 +0200 Subject: [PATCH 5/6] fix some missed out things --- login_server/Dockerfiles/build_and_run.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/login_server/Dockerfiles/build_and_run.sh b/login_server/Dockerfiles/build_and_run.sh index d5ea45235..b246d8230 100644 --- a/login_server/Dockerfiles/build_and_run.sh +++ b/login_server/Dockerfiles/build_and_run.sh @@ -1,9 +1,19 @@ #!/bin/bash cp build/conan* build_vol/ -cd build_vol +cd build_vol cmake -DCMAKE_BUILD_TYPE=Debug .. + +cd .. +if [ ! -d "./src/cpp/proto/hedera" ] ; then + chmod +x unix_parse_proto.sh + ./unix_parse_proto.sh +fi +chmod +x compile_pot.sh +./compile_pot.sh + +cd build_vol cmake .. make -j$(nproc) Gradido_LoginServer #echo "building done" From e3e968b24f470a88997d52141629df13ff264faf Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Fri, 23 Apr 2021 14:09:43 +0200 Subject: [PATCH 6/6] fix exception for unlock on false place, maybe from merging stage1 with stage2 --- login_server/src/cpp/model/Session.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/login_server/src/cpp/model/Session.cpp b/login_server/src/cpp/model/Session.cpp index f7ccc121b..3fbe05a98 100644 --- a/login_server/src/cpp/model/Session.cpp +++ b/login_server/src/cpp/model/Session.cpp @@ -738,7 +738,6 @@ UserState Session::loadUser(const std::string& email, const std::string& passwor } detectSessionState(); - unlock(); if (0 == mNewUser->getModel()->getGroupId()) { return USER_NO_GROUP; }