diff --git a/Dockerfile b/Dockerfile index 5a1067a..43f2ca7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -#Latest version of node tested on. -FROM node:alpine AS dist - +#Latest version of node tested on to test 2 +FROM node:12-alpine AS dist # Tini is recommended for Node apps https://github.com/krallin/tini RUN apk add --no-cache tini diff --git a/README.md b/README.md index fbc4d33..0bf7963 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ - +Testing from critical branch ![Sample image of nodes with data](./nodes.png) # Docker Swarm Visualizer -*** note *** +*** Note *** _This only works with Docker Swarm Mode in Docker Engine 1.12.0 and later. It does not work with the separate Docker Swarm project_ > Also this is a sample app meant for learning Docker. Running this app in production is insecure and should be avoided. If you want to run it in production you must take all security precautions, and in particular [Protect the Docker daemon socket](https://docs.docker.com/engine/security/https/) with SSL. @@ -136,3 +136,4 @@ $ docker run -it -d -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock vi * Comment much more extensively * Create tests and make them work better * Make CSS more elastic. Currently optimized for 3 nodes on a big screen + diff --git a/package-lock.json b/package-lock.json index f285410..5557f1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -540,9 +540,9 @@ "dev": true }, "node_modules/babel-core/node_modules/lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha1-pxLHT9wx9+yyD+RPFX2ALSCAl+8=", "dev": true }, "node_modules/babel-core/node_modules/minimatch": { @@ -679,9 +679,9 @@ } }, "node_modules/babel-plugin-proto-to-assign/node_modules/lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha1-pxLHT9wx9+yyD+RPFX2ALSCAl+8=", "dev": true }, "node_modules/babel-plugin-react-constant-elements": { @@ -3125,9 +3125,9 @@ "devOptional": true }, "node_modules/growl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.0.tgz", + "integrity": "sha512-ElsQbgadAZdhC8L+hx4RJu6fDe5uPCaRjdw8CvD39VYemGQT9CSiLdRAEYFWVIlCbPNlw+G4AbqBhQJF2qyHdg==", "dev": true }, "node_modules/har-schema": { @@ -3350,7 +3350,7 @@ "dependencies": { "http-proxy": "^1.12.0", "is-glob": "^2.0.1", - "lodash": "^3.10.1", + "lodash": "^4.17.12", "micromatch": "^2.3.7" } }, @@ -3376,9 +3376,9 @@ } }, "node_modules/http-proxy-middleware/node_modules/lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha1-pxLHT9wx9+yyD+RPFX2ALSCAl+8=", "dev": true }, "node_modules/http-proxy/node_modules/eventemitter3": { @@ -4161,9 +4161,9 @@ } }, "node_modules/less/node_modules/ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", + "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", "optional": true, "dependencies": { "co": "^4.6.0", @@ -4342,9 +4342,9 @@ } }, "node_modules/loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha1-1LFbhQTGPR/D8q3lLUG8hFnW7eE=", "dependencies": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -4701,7 +4701,7 @@ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "devOptional": true, "dependencies": { - "minimist": "^1.2.5" + "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" @@ -4718,7 +4718,7 @@ "diff": "1.4.0", "escape-string-regexp": "1.0.2", "glob": "3.2.11", - "growl": "1.9.2", + "growl": "1.10.0", "jade": "0.26.3", "mkdirp": "0.5.1", "supports-color": "1.2.0", @@ -4784,9 +4784,9 @@ } }, "node_modules/mocha/node_modules/minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/mocha/node_modules/mkdirp": { @@ -5265,9 +5265,9 @@ } }, "node_modules/optimist/node_modules/minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/optionator": { @@ -8181,9 +8181,9 @@ } }, "node_modules/url-loader/node_modules/loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha1-1LFbhQTGPR/D8q3lLUG8hFnW7eE=", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -8444,16 +8444,16 @@ } }, "node_modules/webpack-dev-server": { - "version": "1.16.5", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-1.16.5.tgz", - "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=", + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.11.tgz", + "integrity": "sha1-O2mLWzJHbx8NPUAUlS/PQqsRggU=", "dev": true, "dependencies": { "compression": "^1.5.2", "connect-history-api-fallback": "^1.3.0", "express": "^4.13.3", "http-proxy-middleware": "~0.17.1", - "open": "0.0.5", + "open": "6.0.0", "optimist": "~0.6.1", "serve-index": "^1.7.2", "sockjs": "^0.3.15", @@ -8513,9 +8513,9 @@ } }, "node_modules/webpack-dev-server/node_modules/open": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz", - "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/open/-/open-6.0.0.tgz", + "integrity": "sha1-yuXiwaOhv67g0KzIxLdgk3R1A0Y=", "dev": true, "engines": { "node": ">= 0.6.0" @@ -9151,9 +9151,9 @@ "dev": true }, "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha1-pxLHT9wx9+yyD+RPFX2ALSCAl+8=", "dev": true }, "minimatch": { @@ -9271,9 +9271,9 @@ }, "dependencies": { "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha1-pxLHT9wx9+yyD+RPFX2ALSCAl+8=", "dev": true } } @@ -11255,9 +11255,9 @@ "devOptional": true }, "growl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.0.tgz", + "integrity": "sha512-ElsQbgadAZdhC8L+hx4RJu6fDe5uPCaRjdw8CvD39VYemGQT9CSiLdRAEYFWVIlCbPNlw+G4AbqBhQJF2qyHdg==", "dev": true }, "har-schema": { @@ -11439,7 +11439,7 @@ "requires": { "http-proxy": "^1.12.0", "is-glob": "^2.0.1", - "lodash": "^3.10.1", + "lodash": "^4.17.12", "micromatch": "^2.3.7" }, "dependencies": { @@ -11459,9 +11459,9 @@ } }, "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha1-pxLHT9wx9+yyD+RPFX2ALSCAl+8=", "dev": true } } @@ -12024,9 +12024,9 @@ }, "dependencies": { "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", + "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", "optional": true, "requires": { "co": "^4.6.0", @@ -12173,9 +12173,9 @@ } }, "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha1-1LFbhQTGPR/D8q3lLUG8hFnW7eE=", "requires": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -12468,7 +12468,7 @@ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "devOptional": true, "requires": { - "minimist": "^1.2.5" + "minimist": "^1.2.6" } }, "mocha": { @@ -12531,9 +12531,9 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "mkdirp": { @@ -12931,9 +12931,9 @@ }, "dependencies": { "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true } } @@ -15426,9 +15426,9 @@ } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha1-1LFbhQTGPR/D8q3lLUG8hFnW7eE=", "dev": true, "requires": { "big.js": "^5.2.2", @@ -15682,16 +15682,16 @@ } }, "webpack-dev-server": { - "version": "1.16.5", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-1.16.5.tgz", - "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=", + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.11.tgz", + "integrity": "sha1-O2mLWzJHbx8NPUAUlS/PQqsRggU=", "dev": true, "requires": { "compression": "^1.5.2", "connect-history-api-fallback": "^1.3.0", "express": "^4.13.3", "http-proxy-middleware": "~0.17.1", - "open": "0.0.5", + "open": "6.0.0", "optimist": "~0.6.1", "serve-index": "^1.7.2", "sockjs": "^0.3.15", @@ -15736,9 +15736,9 @@ } }, "open": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz", - "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/open/-/open-6.0.0.tgz", + "integrity": "sha1-yuXiwaOhv67g0KzIxLdgk3R1A0Y=", "dev": true }, "strip-ansi": { diff --git a/package.json b/package.json index dd09767..93ec23f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "style-loader": "^0.12.3", "url-loader": "^0.5.6", "webpack": "^1.12.0", - "webpack-dev-server": "^1.12.0" + "webpack-dev-server": "^3.1.11" }, "dependencies": { "animate.css": "^3.4.0",