Webionite
/
haste-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Webionite:20fb7f9bc2633734f52ee6d6aa07236b2437d19b
Branches Tags
Webionite:master
Webionite:production
Webionite:jsonp
Webionite:toggle_key
Webionite:gh-pages
Webionite:codemirror
Webionite:no_npm
Webionite:raw_icon
...
compare: Webionite:9b59c4c89b317a3c2e80cc3f2d9b783575b6082b
Branches Tags
Webionite:master
Webionite:production
Webionite:jsonp
Webionite:toggle_key
Webionite:gh-pages
Webionite:codemirror
Webionite:no_npm
Webionite:raw_icon

11 Commits
20fb7f9bc2 ... 9b59c4c89b

Author SHA1 Message Date
Ceda EI 9b59c4c89b Merge upstream changes 2022-02-06 00:05:12 +05:30
Konstantin Rybakov 00d84614c2
Merge pull request #389 from Lockszmith/Fix-Dockerfile 
Fixes #376 + .dockerignore improvement
 2022-01-12 18:04:00 +03:00
Konstantin Rybakov 52e7cef7ef
Merge pull request #402 from Sueqkjs/master 
fixed spell
 2022-01-12 17:08:29 +03:00
Sueqkjs fbff1bc201
fixed spell 
I fixed the spelling because it didn't work~ (crying)
 2021-12-27 22:11:12 +09:00
Denis Berezin 7af15cc32d
Merge pull request #384 from brunosaboia/remove-trailing-spaces 
Remove trailing whitespaces
 2021-11-22 17:44:40 +03:00
Denis Berezin 7f397ce753
Merge pull request #398 from toptal/npm-audit-issues 
Fix high severity npm issues
 2021-11-22 17:35:14 +03:00
Denis Berezin 8f8b039f65 Fix high severity npm issues 2021-11-22 17:33:31 +03:00
Denis Berezin eeaf2d7b18
Merge pull request #393 from jmartin84/391 
fixed STORAGE_USERNAME typo in dockerfile
 2021-11-22 17:20:06 +03:00
Justen Martin db0b7d6444
fixed STORAGE_USERNAME typo in dockerfile 2021-10-06 22:40:46 -05:00
lksz db6e7603f9 Fixes #376 + .dockerignore improvement 2021-09-10 01:02:26 -04:00
Bruno Saboia ad5d7549d7 Remove trailing whitespaces 
Dockerfile contained useless trailing whitespaces, which could generate
"ghost" diffs.
 2021-07-14 11:00:42 +02:00
4 changed files with 22 additions and 15 deletions
Show Stats Expand all files Collapse all files

2
.dockerignore
View File

@ -1,3 +1,5 @@
Dockerfile
.git
npm-debug.log npm-debug.log
node_modules node_modules
*.swp *.swp

9
Dockerfile
View File

@ -23,7 +23,7 @@ ENV STORAGE_TYPE=memcached \
STORAGE_DB=2 \ STORAGE_DB=2 \
STORAGE_AWS_BUCKET= \ STORAGE_AWS_BUCKET= \
STORAGE_AWS_REGION= \ STORAGE_AWS_REGION= \
STORAGE_USENAMER= \ STORAGE_USENAME= \
STORAGE_PASSWORD= \ STORAGE_PASSWORD= \
STORAGE_FILEPATH= STORAGE_FILEPATH=
@ -59,5 +59,10 @@ STOPSIGNAL SIGINT
ENTRYPOINT [ "bash", "docker-entrypoint.sh" ] ENTRYPOINT [ "bash", "docker-entrypoint.sh" ]
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s \ 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"] CMD ["npm", "start"]

4
README.md
View File

@ -156,7 +156,7 @@ All of which are optional except `type` with very logical default values.
### MongoDB ### 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` `npm install mongodb`
@ -164,7 +164,7 @@ Once you've done that, your config section should look like:
``` json ``` json
{ {
"type": "mongodb", "type": "mongo",
"connectionUrl": "mongodb://localhost:27017/database" "connectionUrl": "mongodb://localhost:27017/database"
} }
``` ```

12
package-lock.json generated
View File

@ -568,9 +568,9 @@
} }
}, },
"glob-parent": { "glob-parent": {
"version": "5.1.1", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"dev": true, "dev": true,
"requires": { "requires": {
"is-glob": "^4.0.1" "is-glob": "^4.0.1"
@ -1426,9 +1426,9 @@
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
}, },
"y18n": { "y18n": {
"version": "4.0.0", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
"dev": true "dev": true
}, },
"yallist": { "yallist": {