From c275ed28a38a9a91bb31dc9011c598a2a3cbb113 Mon Sep 17 00:00:00 2001 From: Evgeny Kolyakov Date: Sun, 28 Jul 2019 19:52:48 +0300 Subject: [PATCH] Stable Cluster mode! --- CHANGELOG.md | 8 +++++++- Dockerfile | 2 +- README.md | 6 ++---- index.js | 2 +- lib/network.js | 5 ++--- package.json | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b740660..feb5925 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # Changelog +## [1.8.0] - 28/7/2019 +**Stable Cluster mode!** + +## [1.7.9] - 28/7/2019 +Added Liberapay badge. + ## [1.7.8] - 27/7/2019 -Fixed bin +Fixed test ## [1.7.7] - 27/7/2019 Renamed npm-shrinkwrap.json to package-lock.json and added it to git. diff --git a/Dockerfile b/Dockerfile index 94732a1..9641af2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:12 RUN curl -L https://get.docker.com | sh - -RUN npm i -g docker-server@1.7.9 +RUN npm i -g docker-server@1.8.0 CMD ["docker-server"] \ No newline at end of file diff --git a/README.md b/README.md index 10cb425..dcecd26 100644 --- a/README.md +++ b/README.md @@ -356,11 +356,9 @@ And/or ## Changelog -1.7.9 - Added Liberapay badge. - -1.7.8 - Fixed bin +1.8.0 - **Stable Cluster** mode! -1.7.7 - Renamed npm-shrinkwrap.json to package-lock.json and added it to git. +1.7.9 - Added Liberapay badge. [See full changelog](https://github.com/freaker2k7/dockerserver/blob/master/CHANGELOG.md) diff --git a/index.js b/index.js index e3afc3a..15d8ea1 100644 --- a/index.js +++ b/index.js @@ -33,7 +33,7 @@ app.use(network.check(token)); // Body parsers app.use(express.json({limit: '10kb'})); -app.use(express.urlencoded({extended: false, limit: '10kb'})); +app.use(express.urlencoded({extended: true, limit: '10kb'})); app.use(network.balance(args.port)); diff --git a/lib/network.js b/lib/network.js index 2671c13..ca915df 100644 --- a/lib/network.js +++ b/lib/network.js @@ -11,8 +11,8 @@ var get_req = function(req, host) { return new Promise(function(resolve) { return request({ url: host + req.originalUrl, - headers: Object.assign(req.headers, {'docker-server': 'force', 'content-type': 'application/json'}), - form: req.body, + headers: {'docker-server': 'force', 'content-type': 'application/json', 'authorization': req.get('Authorization')}, + body: req.body && JSON.stringify(req.body) || undefined, method: req.method }, function (err, res, body) { // console.log('request:', host, err, typeof body, body); @@ -125,7 +125,6 @@ module.exports = function(cli_args) { } return function (req, res, next) { - // console.log('000 ??? body', JSON.stringify(req.body)); if (args.cluster && req.get('docker-server') !== 'force') { handle_cluster(req, res, next); } else { diff --git a/package.json b/package.json index 39adb26..d109047 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "docker-server", "author": "Evgeny Kolyakov ", "description": "DockerServer - Super lightweight & simple RESTFul stateless server for running docker containers on a remote machine(s) in a secure way", - "version": "1.7.9", + "version": "1.8.0", "homepage": "https://dockerserver.io", "repository": "freaker2k7/dockerserver", "license": "Apache-2.0",