SunRed/haste-server
1
0
Fork 0
mirror of https://github.com/SunRed/haste-server.git synced 2024-11-27 03:10:18 +01:00
Code Issues Releases Activity

Fix wrong memcached version number and Docker min build

Browse source 
* Memcached version number was set wrong accidentally
* Installation of individual document storage client dependencies in Dockerfile made npm read entire package-lock again and install all dependencies
This commit is contained in:
Manuel 2021-02-15 18:00:15 +01:00
parent fe6697a6f1
commit c6b6d02360
Signed by: Manuel
GPG key ID: 4085037435E1F07A
3 changed files with 107 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Dockerfile
View file

@ -6,12 +6,12 @@ COPY . .
# Replace prod with prod-min to exclude the optional dbms dependencies # Replace prod with prod-min to exclude the optional dbms dependencies
# and uncomment the needed one below to build a smaller Docker image. # and uncomment the needed one below to build a smaller Docker image.
RUN npm run prod RUN npm run prod
#RUN npm install pg #RUN npm install --no-package-lock pg
#RUN npm install aws-sdk #RUN npm install --no-package-lock aws-sdk
#RUN npm install memcached #RUN npm install --no-package-lock memcached
#RUN npm install mongodb #RUN npm install --no-package-lock mongodb
#RUN npm install ioredis #RUN npm install --no-package-lock ioredis
#RUN npm install rethinkdbdash #RUN npm install --no-package-lock rethinkdbdash
FROM mhart/alpine-node:slim-14 FROM mhart/alpine-node:slim-14
RUN apk add --no-cache curl RUN apk add --no-cache curl

101
package-lock.json generated
View file

@ -13,7 +13,7 @@
"express": "^4.17.1", "express": "^4.17.1",
"express-rate-limit": "^5.1.3", "express-rate-limit": "^5.1.3",
"ioredis": "^4.22.0", "ioredis": "^4.22.0",
"memcached": "^3.6.4", "memcached": "^2.2.2",
"mongodb": "^3.6.4", "mongodb": "^3.6.4",
"pg": "^8.5.1", "pg": "^8.5.1",
"rethinkdbdash": "^2.3.31", "rethinkdbdash": "^2.3.31",
@ -30,7 +30,7 @@
"optionalDependencies": { "optionalDependencies": {
"aws-sdk": "^2.842.0", "aws-sdk": "^2.842.0",
"ioredis": "^4.22.0", "ioredis": "^4.22.0",
"memcached": "^3.6.4", "memcached": "^2.2.2",
"mongodb": "^3.6.4", "mongodb": "^3.6.4",
"pg": "^8.5.1", "pg": "^8.5.1",
"rethinkdbdash": "^2.3.31" "rethinkdbdash": "^2.3.31"
@ -1499,6 +1499,12 @@
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true "dev": true
}, },
"node_modules/connection-parse": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz",
"integrity": "sha1-GOcxiqsGppkmc3KxDFIm0locmmk=",
"optional": true
},
"node_modules/content-disposition": { "node_modules/content-disposition": {
"version": "0.5.3", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@ -2733,6 +2739,16 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/hashring": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz",
"integrity": "sha1-/aTv3oqiLNuX+x0qZeiEAeHBRM4=",
"optional": true,
"dependencies": {
"connection-parse": "0.0.x",
"simple-lru-cache": "0.0.x"
}
},
"node_modules/he": { "node_modules/he": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@ -3214,6 +3230,15 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/jackpot": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz",
"integrity": "sha1-PP8GQoXL9m9OqyWTyQvOgWqCGEk=",
"optional": true,
"dependencies": {
"retry": "0.6.0"
}
},
"node_modules/jmespath": { "node_modules/jmespath": {
"version": "0.15.0", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
@ -3433,6 +3458,16 @@
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/memcached": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
"integrity": "sha1-aPhsz9hLz5PMJe1G1tf8DHUhydU=",
"optional": true,
"dependencies": {
"hashring": "3.2.x",
"jackpot": ">=0.0.6"
}
},
"node_modules/memory-pager": { "node_modules/memory-pager": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
@ -4610,6 +4645,15 @@
"bluebird": ">= 3.0.1" "bluebird": ">= 3.0.1"
} }
}, },
"node_modules/retry": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
"integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=",
"optional": true,
"engines": {
"node": "*"
}
},
"node_modules/rimraf": { "node_modules/rimraf": {
"version": "2.6.3", "version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@ -4798,6 +4842,12 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/simple-lru-cache": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz",
"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0=",
"optional": true
},
"node_modules/simple-swizzle": { "node_modules/simple-swizzle": {
"version": "0.2.2", "version": "0.2.2",
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@ -7295,6 +7345,12 @@
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true "dev": true
}, },
"connection-parse": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz",
"integrity": "sha1-GOcxiqsGppkmc3KxDFIm0locmmk=",
"optional": true
},
"content-disposition": { "content-disposition": {
"version": "0.5.3", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@ -8266,6 +8322,16 @@
} }
} }
}, },
"hashring": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz",
"integrity": "sha1-/aTv3oqiLNuX+x0qZeiEAeHBRM4=",
"optional": true,
"requires": {
"connection-parse": "0.0.x",
"simple-lru-cache": "0.0.x"
}
},
"he": { "he": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@ -8623,6 +8689,15 @@
"iterate-iterator": "^1.0.1" "iterate-iterator": "^1.0.1"
} }
}, },
"jackpot": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz",
"integrity": "sha1-PP8GQoXL9m9OqyWTyQvOgWqCGEk=",
"optional": true,
"requires": {
"retry": "0.6.0"
}
},
"jmespath": { "jmespath": {
"version": "0.15.0", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
@ -8798,6 +8873,16 @@
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
}, },
"memcached": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
"integrity": "sha1-aPhsz9hLz5PMJe1G1tf8DHUhydU=",
"optional": true,
"requires": {
"hashring": "3.2.x",
"jackpot": ">=0.0.6"
}
},
"memory-pager": { "memory-pager": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
@ -9710,6 +9795,12 @@
"bluebird": ">= 3.0.1" "bluebird": ">= 3.0.1"
} }
}, },
"retry": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
"integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=",
"optional": true
},
"rimraf": { "rimraf": {
"version": "2.6.3", "version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@ -9858,6 +9949,12 @@
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true "dev": true
}, },
"simple-lru-cache": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz",
"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0=",
"optional": true
},
"simple-swizzle": { "simple-swizzle": {
"version": "0.2.2", "version": "0.2.2",
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",

4
package.json
View file

@ -20,7 +20,7 @@
"express": "^4.17.1", "express": "^4.17.1",
"express-rate-limit": "^5.1.3", "express-rate-limit": "^5.1.3",
"ioredis": "^4.22.0", "ioredis": "^4.22.0",
"memcached": "^3.6.4", "memcached": "^2.2.2",
"mongodb": "^3.6.4", "mongodb": "^3.6.4",
"pg": "^8.5.1", "pg": "^8.5.1",
"rethinkdbdash": "^2.3.31", "rethinkdbdash": "^2.3.31",
@ -30,7 +30,7 @@
"optionalDependencies": { "optionalDependencies": {
"aws-sdk": "^2.842.0", "aws-sdk": "^2.842.0",
"ioredis": "^4.22.0", "ioredis": "^4.22.0",
"memcached": "^3.6.4", "memcached": "^2.2.2",
"mongodb": "^3.6.4", "mongodb": "^3.6.4",
"pg": "^8.5.1", "pg": "^8.5.1",
"rethinkdbdash": "^2.3.31" "rethinkdbdash": "^2.3.31"