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..5e241ab 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 && \ @@ -23,9 +23,9 @@ ENV STORAGE_TYPE=memcached \ STORAGE_DB=2 \ STORAGE_AWS_BUCKET= \ STORAGE_AWS_REGION= \ - STORAGE_USENAMER= \ + STORAGE_USENAME= \ 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} @@ -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"] 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" } ``` 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": {