From ad5d7549d7fc19f9fedac93f7171f2385c170c3d Mon Sep 17 00:00:00 2001 From: Bruno Saboia Date: Wed, 14 Jul 2021 11:00:42 +0200 Subject: [PATCH 1/5] Remove trailing whitespaces Dockerfile contained useless trailing whitespaces, which could generate "ghost" diffs. --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd53efc..725cf14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,11 @@ FROM node:14.8.0-stretch RUN mkdir -p /usr/src/app && \ chown node:node /usr/src/app -USER node:node +USER node:node WORKDIR /usr/src/app -COPY --chown=node:node . . +COPY --chown=node:node . . RUN npm install && \ npm install redis@0.8.1 && \ @@ -25,7 +25,7 @@ ENV STORAGE_TYPE=memcached \ STORAGE_AWS_REGION= \ STORAGE_USENAMER= \ STORAGE_PASSWORD= \ - STORAGE_FILEPATH= + STORAGE_FILEPATH= ENV LOGGING_LEVEL=verbose \ LOGGING_TYPE=Console \ @@ -47,11 +47,11 @@ ENV RATELIMITS_NORMAL_TOTAL_REQUESTS=500\ RATELIMITS_WHITELIST_EVERY_MILLISECONDS= \ # comma separated list for the whitelisted \ RATELIMITS_WHITELIST=example1.whitelist,example2.whitelist \ - \ + \ RATELIMITS_BLACKLIST_TOTAL_REQUESTS= \ RATELIMITS_BLACKLIST_EVERY_MILLISECONDS= \ # comma separated list for the blacklisted \ - RATELIMITS_BLACKLIST=example1.blacklist,example2.blacklist + RATELIMITS_BLACKLIST=example1.blacklist,example2.blacklist ENV DOCUMENTS=about=./about.md EXPOSE ${PORT} From db6e7603f932c579a8b57a2d73964dc3987d997e Mon Sep 17 00:00:00 2001 From: lksz Date: Fri, 10 Sep 2021 01:02:26 -0400 Subject: [PATCH 2/5] Fixes #376 + .dockerignore improvement --- .dockerignore | 2 ++ Dockerfile | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index a865156..d2400f9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,5 @@ +Dockerfile +.git npm-debug.log node_modules *.swp diff --git a/Dockerfile b/Dockerfile index dd53efc..c9e0829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,5 +59,10 @@ STOPSIGNAL SIGINT ENTRYPOINT [ "bash", "docker-entrypoint.sh" ] HEALTHCHECK --interval=30s --timeout=30s --start-period=5s \ - --retries=3 CMD [ "curl" , "-f" "localhost:${PORT}", "||", "exit", "1"] + --retries=3 CMD [ "sh", "-c", "echo -n 'curl localhost:7777... '; \ + (\ + curl -sf localhost:7777 > /dev/null\ + ) && echo OK || (\ + echo Fail && exit 2\ + )"] CMD ["npm", "start"] From db0b7d6444a0362561e98f6417de3c7a7a114dfb Mon Sep 17 00:00:00 2001 From: Justen Martin Date: Wed, 6 Oct 2021 22:40:46 -0500 Subject: [PATCH 3/5] fixed STORAGE_USERNAME typo in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd53efc..5ffa501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ENV STORAGE_TYPE=memcached \ STORAGE_DB=2 \ STORAGE_AWS_BUCKET= \ STORAGE_AWS_REGION= \ - STORAGE_USENAMER= \ + STORAGE_USENAME= \ STORAGE_PASSWORD= \ STORAGE_FILEPATH= From 8f8b039f65af5ba257e3fc1273f1d7503607582d Mon Sep 17 00:00:00 2001 From: Denis Berezin Date: Mon, 22 Nov 2021 17:26:51 +0300 Subject: [PATCH 4/5] Fix high severity npm issues --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab5e934..e0acff0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -568,9 +568,9 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -1426,9 +1426,9 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, "yallist": { From fbff1bc201585745209f7d80fd89a0600d2723b4 Mon Sep 17 00:00:00 2001 From: Sueqkjs <68449029+Sueqkjs@users.noreply.github.com> Date: Mon, 27 Dec 2021 22:11:12 +0900 Subject: [PATCH 5/5] fixed spell I fixed the spelling because it didn't work~ (crying) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b42c844..432a93e 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ All of which are optional except `type` with very logical default values. ### MongoDB -To use mongodb storage you must install the 'mongodb' pachage in npm +To use mongodb storage you must install the 'mongodb' package in npm `npm install mongodb` @@ -164,7 +164,7 @@ Once you've done that, your config section should look like: ``` json { - "type": "mongodb", + "type": "mongo", "connectionUrl": "mongodb://localhost:27017/database" } ```