From 611354730498666e967e0fbff7d6b50e6d2af9bd Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 24 Feb 2022 18:32:38 +0100 Subject: [PATCH 1/5] v4.7.1-beta.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 646b4a4b6..4ea3f3327 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.7.1-docker.2", + "version": "4.7.1-beta.3", "name": "dbgate-all", "workspaces": [ "packages/*", From 462f9854069492a0ad2dd56d352fe1ebaee10fbf Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 26 Feb 2022 09:54:14 +0100 Subject: [PATCH 2/5] #228 use nginx as proxy --- docker-compose.yaml | 10 +++++-- packages/api/src/main.js | 1 + packages/api/src/utility/socket.js | 1 + test/nginx/Dockerfile | 3 ++ test/nginx/nginx.conf | 44 ++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 test/nginx/Dockerfile create mode 100644 test/nginx/nginx.conf diff --git a/docker-compose.yaml b/docker-compose.yaml index f15413a71..657296280 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,8 +3,8 @@ version: "3" services: dbgate: - # build: docker - image: dbgate/dbgate:beta-alpine + build: docker + # image: dbgate/dbgate:beta-alpine restart: always ports: - 3100:3000 @@ -17,6 +17,12 @@ services: environment: WEB_ROOT: /dbgate + proxy: + # image: nginx + build: test/nginx + ports: + - 8082:80 + # volumes: # - /home/jena/test/chinook:/mnt/sqt # environment: diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 0a08bb37d..c95eaae89 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -55,6 +55,7 @@ function start() { res.set({ 'Cache-Control': 'no-cache', 'Content-Type': 'text/event-stream', + 'X-Accel-Buffering': 'no', Connection: 'keep-alive', }); res.flushHeaders(); diff --git a/packages/api/src/utility/socket.js b/packages/api/src/utility/socket.js index 86eb04334..639325a44 100644 --- a/packages/api/src/utility/socket.js +++ b/packages/api/src/utility/socket.js @@ -5,6 +5,7 @@ let init = ''; module.exports = { setSseResponse(value) { sseResponse = value; + setInterval(() => this.emit('ping'), 30 * 1000); }, setElectronSender(value) { electronSender = value; diff --git a/test/nginx/Dockerfile b/test/nginx/Dockerfile new file mode 100644 index 000000000..d6eac3e8e --- /dev/null +++ b/test/nginx/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/test/nginx/nginx.conf b/test/nginx/nginx.conf new file mode 100644 index 000000000..fd3f9100a --- /dev/null +++ b/test/nginx/nginx.conf @@ -0,0 +1,44 @@ +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + # include /etc/nginx/conf.d/*.conf; + + server { + # listen 80; + + # return 302 https://dbgate.org; + + location /dbgate { + proxy_pass http://dbgate:3000; + + # proxy_http_version 1.1; + # proxy_set_header Connection ""; + } + } +} From c866a89dbb8a1c09f3ec417a883c0454696b813d Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 26 Feb 2022 09:54:36 +0100 Subject: [PATCH 3/5] v4.7.1-docker.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ea3f3327..35f5c2888 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.7.1-beta.3", + "version": "4.7.1-docker.4", "name": "dbgate-all", "workspaces": [ "packages/*", From 1c977bb7ae84eba6aea3fd5050f2c58e18b3f1b0 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 26 Feb 2022 09:58:15 +0100 Subject: [PATCH 4/5] smaller SSE ping interval --- packages/api/src/utility/socket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/utility/socket.js b/packages/api/src/utility/socket.js index 639325a44..ccce6d53d 100644 --- a/packages/api/src/utility/socket.js +++ b/packages/api/src/utility/socket.js @@ -5,7 +5,7 @@ let init = ''; module.exports = { setSseResponse(value) { sseResponse = value; - setInterval(() => this.emit('ping'), 30 * 1000); + setInterval(() => this.emit('ping'), 29 * 1000); }, setElectronSender(value) { electronSender = value; From ae7dccb5b76371a8d30207de223eb0c371c5b045 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 26 Feb 2022 09:58:25 +0100 Subject: [PATCH 5/5] v4.7.1-docker.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35f5c2888..5a28ee5b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "4.7.1-docker.4", + "version": "4.7.1-docker.5", "name": "dbgate-all", "workspaces": [ "packages/*",