Merge pull request #138 from gradido/fix_compose_bug

Fix compose bug

docker-compose.override.yml

@@ -43,7 +43,7 @@ services:
       - community-server
       - login-server
     volumes: 
-      - ./logs:/var/log/nginx 
+      - ./logs/nginx:/var/log/nginx 
   
   #########################################################
   ## PHPMYADMIN ###########################################

docker-compose.yml

@@ -16,8 +16,6 @@ services:
       target: production
     networks:
       - external-net
-    depends_on:
-      - nginx
     ports:
       - 8080:8080
     environment:
@@ -69,6 +67,7 @@ services:
       - 1201:1201
     volumes:
       - ./configs/login_server:/etc/grd_login
+      - login_build:/code/build_vol
       
   #########################################################
   ## NGINX ################################################
@@ -135,4 +134,5 @@ networks:
     internal: true
 
 volumes:
-  db_vol:      
+  db_vol: 
+  login_build:

frontend/vue.config.js

@@ -7,7 +7,7 @@ function resolveSrc(_path) {
 
 let vue_path = process.env.VUE_PATH
 if (vue_path == undefined) {
-  vue_path = ''
+  vue_path = '/vue'
 }
 
 // vue.config.js

login_server/Dockerfile.debug

@@ -64,4 +64,4 @@ RUN chmod +x ./Dockerfiles/build_and_run.sh
 #RUN chmod +x ./start_after_mysql.sh
 #ENTRYPOINT ["/usr/bin/Gradido_LoginServer"]
 #CMD gdb -ex=r Gradido_LoginServer
-CMD ./Dockerfiles/build_and_run.sh
+CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer

login_server/Dockerfiles/build_and_run.sh

@@ -4,6 +4,6 @@ cd build_vol
 
 cmake -DCMAKE_BUILD_TYPE=Debug ..
 make -j$(nproc) Gradido_LoginServer
-echo "building done"
+#echo "building done"
 chmod +x ./bin/Gradido_LoginServer
-./bin/Gradido_LoginServer
+#./bin/Gradido_LoginServer

login_server/src/cpp/Gradido_LoginServer.cpp

@@ -248,6 +248,7 @@ int Gradido_LoginServer::main(const std::vector<std::string>& args)
 		json_srv.start();
 
 		printf("[Gradido_LoginServer::main] started in %s\n", usedTime.string().data());
+		std::clog << "[Gradido_LoginServer::main] started in " << usedTime.string().data() << std::endl;
 		// wait for CTRL-C or kill
 		waitForTerminationRequest();
 

nginx/nginx.conf

@@ -14,14 +14,6 @@ server {
 	root /var/www/cakephp/webroot;
 	index index.php;	
 	
-	location ~* \.(png|jpg|ico|webp)$ {
-	  expires 30d;
-	}
-
-	location ~* \.(js|css) {
-	#   expires 1d;
-	  expires 1d;
-	}
 
 	location ~ \.php$ {
 	  fastcgi_pass community-server:9000;
@@ -72,6 +64,29 @@ server {
 	location / {
 			try_files $uri $uri/ /index.php?$args;
 	}
+	
+	location /vue {
+
+		location /vue/sockjs-node {
+			rewrite  /vue/(.*) /$1;
+		}
+		location ~* \.(png) {
+			expires 1d;
+			rewrite  /vue/(.*) /$1;
+		}
+
+
+		proxy_http_version 1.1;
+		proxy_set_header   Upgrade $http_upgrade;
+		proxy_set_header   Connection 'upgrade';
+		proxy_set_header   X-Forwarded-For $remote_addr;
+		proxy_set_header   X-Real-IP  $remote_addr;
+		proxy_set_header   Host $host;
+		#rewrite  /vue/(.*) /$1 break;
+
+		proxy_pass         http://frontend:8080;
+		proxy_redirect     off;
+	}
 
 #	access_log /var/log/nginx/access.log main;