From 7787863c236bacb7a100a6435144cf1fca841433 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 6 Apr 2021 17:05:07 +0200 Subject: [PATCH 1/3] fix compose bug --- docker-compose.override.yml | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 1d51ce837..1fdb57699 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -43,7 +43,7 @@ services: - community-server - login-server volumes: - - ./logs:/var/log/nginx + - ./logs/nginx:/var/log/nginx ######################################################### ## PHPMYADMIN ########################################### diff --git a/docker-compose.yml b/docker-compose.yml index ad291eac8..0acfb5cbb 100644 --- a/docker-compose.yml +++ b/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: From 6c7bddb8bcf958359f53016fadca4623e6eb17fc Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 6 Apr 2021 17:50:14 +0200 Subject: [PATCH 2/3] make login-server successfully logging start to Docker Console --- login_server/Dockerfile.debug | 2 +- login_server/Dockerfiles/build_and_run.sh | 4 ++-- login_server/src/cpp/Gradido_LoginServer.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/login_server/Dockerfile.debug b/login_server/Dockerfile.debug index 4c9945f8c..f0c25dc3a 100644 --- a/login_server/Dockerfile.debug +++ b/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 diff --git a/login_server/Dockerfiles/build_and_run.sh b/login_server/Dockerfiles/build_and_run.sh index ee9999532..59408daca 100644 --- a/login_server/Dockerfiles/build_and_run.sh +++ b/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 diff --git a/login_server/src/cpp/Gradido_LoginServer.cpp b/login_server/src/cpp/Gradido_LoginServer.cpp index 423f603df..ce78c170e 100644 --- a/login_server/src/cpp/Gradido_LoginServer.cpp +++ b/login_server/src/cpp/Gradido_LoginServer.cpp @@ -248,6 +248,7 @@ int Gradido_LoginServer::main(const std::vector& 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(); From ec97e2adb013b775b18fa91887a38a0ef22945ed Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 6 Apr 2021 17:51:21 +0200 Subject: [PATCH 3/3] add back lost vue entry in nginx.conf and set /vue as default VUE_PATH if no .env is present --- frontend/vue.config.js | 2 +- nginx/nginx.conf | 31 +++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 9f3d486c0..ad2c10585 100644 --- a/frontend/vue.config.js +++ b/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 diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 55d35e264..4fa5ab0d0 100644 --- a/nginx/nginx.conf +++ b/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;