diff --git a/Dockerfile b/Dockerfile index ce44645..5820b29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,7 @@ -FROM node:11.13.0-alpine +FROM node:13.13.0 WORKDIR /app -RUN apk add --update git python make gcc g++ - COPY package.json package.json COPY yarn.lock yarn.lock diff --git a/docker-compose.yml b/docker-compose.yml index 4e4e8f8..cbf24a4 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,12 +73,10 @@ services: ports: - "6379:6379" minio: - image: minio/minio:RELEASE.2018-05-16T23-35-33Z + image: minio/minio volumes: - export:/export command: server /export - ports: - - "9000:9000" environment: MINIO_ACCESS_KEY: 7HYV3KPRGQ8Z5YCDNWC6 MINIO_SECRET_KEY: "0kWP/ZkgIwQzgL9t4SGv9Uc93rO//OdyqMH329b/" diff --git a/package.json b/package.json index 8710f9d..4afa3ec 100644 --- a/package.json +++ b/package.json @@ -74,13 +74,13 @@ "moment": "^2.24.0", "mz": "^2.7.0", "node-fetch": "^2.3.0", - "node-sass": "^4.13.1", - "node-uuid": "^1.4.8", - "passwords": "^1.3.1", - "pg": "^7.18.2", "redis": "^3.0.2", "sequelize": "^5.21.11", - "smooth-scroll": "^16.1.2", + "node-sass": "^4.14.0", + "node-uuid": "^1.4.8", + "passwords": "^1.3.1", + "pg": "^8.0.3", + "smooth-scroll": "https://github.com/cferdinandi/smooth-scroll#5.3.7", "statsy": "~0.2.0", "stripe": "^8.61.0", "webpack": "^4.43.0", diff --git a/test/web/user.spec.js b/test/web/user.spec.js index 89989ee..6e46bfb 100644 --- a/test/web/user.spec.js +++ b/test/web/user.spec.js @@ -27,7 +27,10 @@ describe('hostr-web user', function() { .send({'email': 'test@hostr.co', 'password': 'test-password', '_csrf': csrf}) .expect(302) .expect('Location', '/') - .end(); + .end(function() { + // Hax + process.exit(); + }); }); }); }); diff --git a/yarn.lock b/yarn.lock index b0dbcfb..534157a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5585,10 +5585,10 @@ node-redis-warlock@~0.2.0: node-redis-scripty "0.0.5" uuid "^2.0.1" -node-sass@^4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" - integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw== +node-sass@^4.14.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.0.tgz#a8e9d7720f8e15b4a1072719dcf04006f5648eeb" + integrity sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6179,15 +6179,15 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-packet-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914" - integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg== +pg-pool@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.1.1.tgz#83763aa042ca8e48b0723693b3de3ff076de4ca1" + integrity sha512-kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A== -pg-pool@^2.0.10: - version "2.0.10" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a" - integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg== +pg-protocol@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.2.2.tgz#e16ef28087aa725ce933af092bfe38d8f609faab" + integrity sha512-r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg== pg-types@^2.1.0: version "2.2.0" @@ -6200,16 +6200,16 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^7.18.2: - version "7.18.2" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb" - integrity sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA== +pg@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.0.3.tgz#b220ee468a1819e1c7e9ca9878f8ae50ba8e1952" + integrity sha512-fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "0.1.3" - pg-packet-stream "^1.1.0" - pg-pool "^2.0.10" + pg-pool "^3.1.1" + pg-protocol "^1.2.2" pg-types "^2.1.0" pgpass "1.x" semver "4.3.2" @@ -7259,10 +7259,9 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -smooth-scroll@^16.1.2: - version "16.1.2" - resolved "https://registry.yarnpkg.com/smooth-scroll/-/smooth-scroll-16.1.2.tgz#77e70bdaaee849a6a24420741406a7d99c53b819" - integrity sha512-zo/61lPWCxzsjYfxbqr9a94PIFSU840+0e053+n6Hf0RcX8MtjtNXNSInEYRlbGaJ2/nezyEWPywsm3TCya0vQ== +"smooth-scroll@https://github.com/cferdinandi/smooth-scroll#5.3.7": + version "5.3.7" + resolved "https://github.com/cferdinandi/smooth-scroll#b5621ff47293b8ec957c271a72121254349f169e" snapdragon-node@^2.0.1: version "2.1.1"