Commit d487efe7 authored by nanahira's avatar nanahira

use updated redlock

parent a0d9fac5
Pipeline #38999 passed with stages
in 3 minutes and 6 seconds
...@@ -15,12 +15,12 @@ COPY console-api/package*.json ./ ...@@ -15,12 +15,12 @@ COPY console-api/package*.json ./
FROM api-base as api FROM api-base as api
COPY console-api ./ COPY console-api ./
RUN npm ci RUN npm ci -f
RUN npm run build RUN npm run build
FROM api-base FROM api-base
ENV NODE_ENV=production ENV NODE_ENV=production
RUN npm ci RUN npm ci -f
COPY --from=api /app/dist dist COPY --from=api /app/dist dist
COPY --from=api /app/views views COPY --from=api /app/views views
#COPY --from=web /app/dist/console-web public #COPY --from=web /app/dist/console-web public
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "^3.26.0", "@aws-sdk/client-s3": "^3.26.0",
"@aws-sdk/lib-storage": "^3.26.0", "@aws-sdk/lib-storage": "^3.26.0",
"@nanahira/redlock": "^1.0.1",
"@nestjs-modules/ioredis": "^1.0.1", "@nestjs-modules/ioredis": "^1.0.1",
"@nestjs/axios": "^0.0.1", "@nestjs/axios": "^0.0.1",
"@nestjs/cli": "^8.0.0", "@nestjs/cli": "^8.0.0",
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
"@nestjs/serve-static": "^2.2.2", "@nestjs/serve-static": "^2.2.2",
"@nestjs/swagger": "^5.0.9", "@nestjs/swagger": "^5.0.9",
"@nestjs/typeorm": "^8.0.2", "@nestjs/typeorm": "^8.0.2",
"@sesamecare-oss/redlock": "^1.4.0",
"axios": "^0.21.1", "axios": "^0.21.1",
"busboy": "^0.2.14", "busboy": "^0.2.14",
"class-transformer": "^0.4.0", "class-transformer": "^0.4.0",
...@@ -2392,18 +2392,6 @@ ...@@ -2392,18 +2392,6 @@
"url": "https://github.com/chalk/chalk?sponsor=1" "url": "https://github.com/chalk/chalk?sponsor=1"
} }
}, },
"node_modules/@nanahira/redlock": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@nanahira/redlock/-/redlock-1.0.1.tgz",
"integrity": "sha512-gpHYiz0P57SJDNsgr/sh/1Qn12fbdfVx1AlWWbfd56M0PWPzewqwJhY3U6wInvxC0yX6ynTFioqnvJ8vNGJIDw==",
"license": "MIT",
"dependencies": {
"node-abort-controller": "^3.0.1"
},
"engines": {
"node": ">=12"
}
},
"node_modules/@nestjs-modules/ioredis": { "node_modules/@nestjs-modules/ioredis": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@nestjs-modules/ioredis/-/ioredis-1.0.1.tgz", "resolved": "https://registry.npmjs.org/@nestjs-modules/ioredis/-/ioredis-1.0.1.tgz",
...@@ -3145,6 +3133,18 @@ ...@@ -3145,6 +3133,18 @@
"url": "https://github.com/chalk/chalk?sponsor=1" "url": "https://github.com/chalk/chalk?sponsor=1"
} }
}, },
"node_modules/@sesamecare-oss/redlock": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@sesamecare-oss/redlock/-/redlock-1.4.0.tgz",
"integrity": "sha512-2z589R+yxKLN4CgKxP1oN4dsg6Y548SE4bVYam/R0kHk7Q9VrQ9l66q+k1ehhSLLY4or9hcchuF9/MhuuZdjJg==",
"license": "UNLICENSED",
"engines": {
"node": ">=16"
},
"peerDependencies": {
"ioredis": ">=5"
}
},
"node_modules/@sinonjs/commons": { "node_modules/@sinonjs/commons": {
"version": "1.8.3", "version": "1.8.3",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
...@@ -8770,11 +8770,6 @@ ...@@ -8770,11 +8770,6 @@
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
}, },
"node_modules/node-abort-controller": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
"integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="
},
"node_modules/node-emoji": { "node_modules/node-emoji": {
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
...@@ -13822,14 +13817,6 @@ ...@@ -13822,14 +13817,6 @@
} }
} }
}, },
"@nanahira/redlock": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@nanahira/redlock/-/redlock-1.0.1.tgz",
"integrity": "sha512-gpHYiz0P57SJDNsgr/sh/1Qn12fbdfVx1AlWWbfd56M0PWPzewqwJhY3U6wInvxC0yX6ynTFioqnvJ8vNGJIDw==",
"requires": {
"node-abort-controller": "^3.0.1"
}
},
"@nestjs-modules/ioredis": { "@nestjs-modules/ioredis": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@nestjs-modules/ioredis/-/ioredis-1.0.1.tgz", "resolved": "https://registry.npmjs.org/@nestjs-modules/ioredis/-/ioredis-1.0.1.tgz",
...@@ -14335,6 +14322,12 @@ ...@@ -14335,6 +14322,12 @@
} }
} }
}, },
"@sesamecare-oss/redlock": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@sesamecare-oss/redlock/-/redlock-1.4.0.tgz",
"integrity": "sha512-2z589R+yxKLN4CgKxP1oN4dsg6Y548SE4bVYam/R0kHk7Q9VrQ9l66q+k1ehhSLLY4or9hcchuF9/MhuuZdjJg==",
"requires": {}
},
"@sinonjs/commons": { "@sinonjs/commons": {
"version": "1.8.3", "version": "1.8.3",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
...@@ -18668,11 +18661,6 @@ ...@@ -18668,11 +18661,6 @@
"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
}, },
"node-abort-controller": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
"integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="
},
"node-emoji": { "node-emoji": {
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "^3.26.0", "@aws-sdk/client-s3": "^3.26.0",
"@aws-sdk/lib-storage": "^3.26.0", "@aws-sdk/lib-storage": "^3.26.0",
"@nanahira/redlock": "^1.0.1",
"@nestjs-modules/ioredis": "^1.0.1", "@nestjs-modules/ioredis": "^1.0.1",
"@nestjs/axios": "^0.0.1", "@nestjs/axios": "^0.0.1",
"@nestjs/cli": "^8.0.0", "@nestjs/cli": "^8.0.0",
...@@ -34,6 +33,7 @@ ...@@ -34,6 +33,7 @@
"@nestjs/serve-static": "^2.2.2", "@nestjs/serve-static": "^2.2.2",
"@nestjs/swagger": "^5.0.9", "@nestjs/swagger": "^5.0.9",
"@nestjs/typeorm": "^8.0.2", "@nestjs/typeorm": "^8.0.2",
"@sesamecare-oss/redlock": "^1.4.0",
"axios": "^0.21.1", "axios": "^0.21.1",
"busboy": "^0.2.14", "busboy": "^0.2.14",
"class-transformer": "^0.4.0", "class-transformer": "^0.4.0",
......
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import Redlock from '@nanahira/redlock'; import { Redlock } from '@sesamecare-oss/redlock';
import { ConfigService } from '@nestjs/config'; import { ConfigService } from '@nestjs/config';
import Redis from 'ioredis'; import Redis from 'ioredis';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment