From 6d11801d564f47bdb0afdf988f6cbae8c9726528 Mon Sep 17 00:00:00 2001 From: Clement Michaud Date: Tue, 24 Oct 2017 00:11:22 +0200 Subject: [PATCH] Change the how-to to build Authelia in the README --- README.md | 3 +- package-lock.json | 66 +++++++++++++++++++++--------------- package.json | 3 +- scripts/build-dev.sh | 5 +++ scripts/integration-tests.sh | 4 +-- 5 files changed, 49 insertions(+), 32 deletions(-) create mode 100755 scripts/build-dev.sh diff --git a/README.md b/README.md index 47f8a701d..3b6002d0b 100644 --- a/README.md +++ b/README.md @@ -110,8 +110,7 @@ Deploy the **Authelia** example with one of the following commands: Build Docker container from current commit: - npm install --only=dev - ./node_modules/.bin/grunt build-dist + ./scripts/build-dev.sh ./scripts/example-commit/deploy-example.sh Use provided container on [DockerHub](https://hub.docker.com/r/clems4ever/authelia/): diff --git a/package-lock.json b/package-lock.json index fdb8e20ea..337bfa050 100644 --- a/package-lock.json +++ b/package-lock.json @@ -870,7 +870,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } @@ -936,7 +936,7 @@ "punycode": "1.3.2", "querystring-es3": "0.2.1", "read-only-stream": "2.0.0", - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "resolve": "1.4.0", "shasum": "1.0.2", "shell-quote": "1.6.1", @@ -1002,7 +1002,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } }, @@ -1055,7 +1055,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } @@ -1117,7 +1117,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } @@ -1865,7 +1865,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } @@ -1949,11 +1949,6 @@ "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=" }, - "dovehash": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/dovehash/-/dovehash-0.0.5.tgz", - "integrity": "sha1-gB1nAF/3BKKafB7LZpPJ/8Z2Ysg=" - }, "dtrace-provider": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz", @@ -1975,7 +1970,7 @@ "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "dev": true, "requires": { - "readable-stream": "2.2.7" + "readable-stream": "2.3.3" } }, "duration": { @@ -2392,7 +2387,7 @@ "dev": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "typedarray": "0.0.6" } }, @@ -3541,7 +3536,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } @@ -4755,7 +4750,7 @@ "duplexer2": "0.1.4", "inherits": "2.0.3", "parents": "1.0.1", - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "resolve": "1.4.0", "stream-combiner2": "1.1.1", "subarg": "1.0.0", @@ -4769,7 +4764,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } @@ -4795,6 +4790,22 @@ "es6-promise": "3.2.1", "mongodb-core": "2.1.17", "readable-stream": "2.2.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz", + "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=", + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + } } }, "mongodb-core": { @@ -7173,7 +7184,7 @@ "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=", "dev": true, "requires": { - "readable-stream": "2.2.7" + "readable-stream": "2.3.3" } }, "read-pkg": { @@ -7198,15 +7209,16 @@ } }, "readable-stream": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz", - "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, "requires": { - "buffer-shims": "1.0.0", "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", "string_decoder": "1.0.3", "util-deprecate": "1.0.2" } @@ -7219,7 +7231,7 @@ "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "set-immediate-shim": "1.0.1" } }, @@ -7893,7 +7905,7 @@ "dev": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.2.7" + "readable-stream": "2.3.3" } }, "stream-combiner2": { @@ -7903,7 +7915,7 @@ "dev": true, "requires": { "duplexer2": "0.1.4", - "readable-stream": "2.2.7" + "readable-stream": "2.3.3" } }, "stream-http": { @@ -7914,7 +7926,7 @@ "requires": { "builtin-status-codes": "3.0.0", "inherits": "2.0.3", - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "to-arraybuffer": "1.0.1", "xtend": "4.0.1" } @@ -7926,7 +7938,7 @@ "dev": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.2.7" + "readable-stream": "2.3.3" } }, "strict-uri-encode": { @@ -8985,7 +8997,7 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.2.7", + "readable-stream": "2.3.3", "xtend": "4.0.1" } } diff --git a/package.json b/package.json index 36fa2d787..bfb6fede6 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "ajv": "^5.2.3", - "bluebird": "3.5.0", + "bluebird": "^3.5.0", "body-parser": "^1.15.2", "connect-redis": "^3.3.0", "crypt3": "^1.0.0", @@ -96,6 +96,7 @@ "power-assert": "^1.4.4", "proxyquire": "^1.8.0", "query-string": "^4.3.4", + "readable-stream": "^2.3.3", "request": "^2.83.0", "request-promise": "^4.2.2", "selenium-webdriver": "^3.5.0", diff --git a/scripts/build-dev.sh b/scripts/build-dev.sh new file mode 100755 index 000000000..5eb3b6984 --- /dev/null +++ b/scripts/build-dev.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +npm i +grunt schema +grunt build diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh index 09f16ad9d..639e80cc6 100755 --- a/scripts/integration-tests.sh +++ b/scripts/integration-tests.sh @@ -42,8 +42,8 @@ run_integration_tests() { run_other_tests() { echo "Test dev environment deployment (commands in README)" - npm install --only=dev - ./node_modules/.bin/grunt build-dist + rm -rf node_modules + ./scripts/build-dev.sh ./scripts/example-commit/deploy-example.sh expect_services_count $EXPECTED_SERVICES_COUNT }