Merge pull request #225 from gradido/rollback_use_prebuild_dependencies

Rollback use prebuild dependencies

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);
-          }
         }
 
         

docker-compose.override.yml

@@ -34,8 +34,7 @@ services:
       - ./logs:/var/log/grd_login 
       - ./login_server/src:/code/src
       - ./configs/login_server:/etc/grd_login
-      - login_build:/code/build
-      - conan:/root/.conan
+      - login_build_conan:/code/build_vol
 
 
   #########################################################
@@ -100,6 +99,5 @@ services:
    
 volumes:
   frontend_node_modules:
-  login_build:
-  conan:
+  login_build_conan:
 

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)
   },
 }
 

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

login_server/Dockerfiles/build_and_run.sh

@@ -1,5 +1,27 @@
 #!/bin/bash
 
+cp build/conan* 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"
+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 +43,4 @@ make -j$(nproc) Gradido_LoginServer
 #echo "building done"
 chmod +x ./bin/Gradido_LoginServer
 #./bin/Gradido_LoginServer
+'

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;
 	}