fix npm audit (except nodeunit)
add .nvmrc docker nodejs build in a folder on the ephemeral disk so we don't interfere with lib and node_modules folders
This commit is contained in:
parent
bf1ebfaab0
commit
9842cc6164
11
build-and-test.sh
Executable file
11
build-and-test.sh
Executable file
|
@ -0,0 +1,11 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [[ -d /var/code/src ]]; then
|
||||||
|
cp -R /var/code/{src,test,*.js,*.json} .
|
||||||
|
fi
|
||||||
|
|
||||||
|
npm i
|
||||||
|
npm run build
|
||||||
|
npm run test-debug
|
|
@ -108,17 +108,18 @@ services:
|
||||||
- ./certs:/etc/eventstore/certs:ro
|
- ./certs:/etc/eventstore/certs:ro
|
||||||
|
|
||||||
nodejs:
|
nodejs:
|
||||||
image: node:12
|
image: node:14
|
||||||
working_dir: /var/code
|
working_dir: /var/build
|
||||||
volumes:
|
volumes:
|
||||||
- .:/var/code
|
- ./:/var/code:ro
|
||||||
- /var/code/node_modules
|
- ./build-and-test.sh:/var/build/build-and-test.sh:ro
|
||||||
- ./certs:/var/certs:ro
|
- ./certs:/var/certs:ro
|
||||||
environment:
|
environment:
|
||||||
- NODE_EXTRA_CA_CERTS=/var/certs/ca/ca.crt
|
- NODE_EXTRA_CA_CERTS=/var/certs/ca/ca.crt
|
||||||
command: bash -c "tail -f /dev/null"
|
command: bash -c "tail -f /dev/null"
|
||||||
networks:
|
networks:
|
||||||
- app_net
|
app_net:
|
||||||
|
ipv4_address: 192.168.33.5
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
eventstore1-data:
|
eventstore1-data:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
version: '3.4'
|
version: '3.4'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
eventstore.db:
|
eventstore:
|
||||||
image: eventstore/eventstore:20.10.5-buster-slim
|
image: eventstore/eventstore:20.10.5-buster-slim
|
||||||
environment:
|
environment:
|
||||||
- EVENTSTORE_CLUSTER_SIZE=1
|
- EVENTSTORE_CLUSTER_SIZE=1
|
||||||
|
@ -31,16 +31,17 @@ services:
|
||||||
|
|
||||||
nodejs:
|
nodejs:
|
||||||
image: node:14
|
image: node:14
|
||||||
working_dir: /var/code
|
working_dir: /var/build
|
||||||
volumes:
|
volumes:
|
||||||
- .:/var/code
|
- ./:/var/code:ro
|
||||||
- /var/code/node_modules
|
- ./build-and-test.sh:/var/build/build-and-test.sh:ro
|
||||||
- ./certs:/var/certs:ro
|
- ./certs:/var/certs:ro
|
||||||
environment:
|
environment:
|
||||||
- NODE_EXTRA_CA_CERTS=/var/certs/ca/ca.crt
|
- NODE_EXTRA_CA_CERTS=/var/certs/ca/ca.crt
|
||||||
command: bash -c "tail -f /dev/null"
|
command: bash -c "tail -f /dev/null"
|
||||||
networks:
|
networks:
|
||||||
- app_net
|
app_net:
|
||||||
|
ipv4_address: 192.168.33.5
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
eventstore-data:
|
eventstore-data:
|
||||||
|
|
9776
package-lock.json
generated
9776
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
|
@ -12,7 +12,7 @@
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -f lib/dist.js",
|
"clean": "rm -f lib/dist.js",
|
||||||
"prebuild": "npm run clean",
|
"prebuild": "npm run clean",
|
||||||
"build": "webpack -o ./lib/dist.js",
|
"build": "webpack",
|
||||||
"pretest": "npm run build",
|
"pretest": "npm run build",
|
||||||
"test": "nodeunit",
|
"test": "nodeunit",
|
||||||
"test-debug": "TESTS_VERBOSE_LOGGING=1 nodeunit",
|
"test-debug": "TESTS_VERBOSE_LOGGING=1 nodeunit",
|
||||||
|
@ -25,9 +25,9 @@
|
||||||
"compose:single:stop": "docker-compose -f docker-compose-single.yaml down -v --remove-orphans",
|
"compose:single:stop": "docker-compose -f docker-compose-single.yaml down -v --remove-orphans",
|
||||||
"compose:cluster:stop": "docker-compose -f docker-compose-cluster.yaml down -v --remove-orphans",
|
"compose:cluster:stop": "docker-compose -f docker-compose-cluster.yaml down -v --remove-orphans",
|
||||||
"compose:wait": "while [ \"$(curl -s -o /dev/null -w ''%{http_code}'' -k https://localhost:2113/ping)\" != \"200\" ]; do sleep 5; done",
|
"compose:wait": "while [ \"$(curl -s -o /dev/null -w ''%{http_code}'' -k https://localhost:2113/ping)\" != \"200\" ]; do sleep 5; done",
|
||||||
"compose:single:test": "docker-compose -f docker-compose-single.yaml exec nodejs bash -c \"npm i && npm run build && EVENTSTORE_CONNECTION_TYPE=tcp EVENTSTORE_HOST=192.168.33.10 npm run test-debug\"",
|
"compose:single:test": "docker-compose -f docker-compose-single.yaml exec nodejs bash -c \"EVENTSTORE_CONNECTION_TYPE=tcp EVENTSTORE_HOST=192.168.33.10 ./build-and-test.sh\"",
|
||||||
"compose:gossip:test": "docker-compose -f docker-compose-cluster.yaml exec nodejs bash -c \"npm i && npm run build && EVENTSTORE_CONNECTION_TYPE=gossip EVENTSTORE_HOST=192.168.33.10 EVENTSTORE_HOST_1=192.168.33.10 EVENTSTORE_HOST_2=192.168.33.11 EVENTSTORE_HOST_3=192.168.33.12 npm run test-debug\"",
|
"compose:gossip:test": "docker-compose -f docker-compose-cluster.yaml exec nodejs bash -c \"EVENTSTORE_CONNECTION_TYPE=gossip EVENTSTORE_HOST=192.168.33.10 EVENTSTORE_HOST_1=192.168.33.10 EVENTSTORE_HOST_2=192.168.33.11 EVENTSTORE_HOST_3=192.168.33.12 ./build-and-test.sh\"",
|
||||||
"compose:cluster:test": "docker-compose -f docker-compose-cluster.yaml exec nodejs bash -c \"npm i && npm run build && EVENTSTORE_CONNECTION_TYPE=dns EVENTSTORE_HOST=cluster.tests.node-eventstore-client.local npm run test-debug\"",
|
"compose:cluster:test": "docker-compose -f docker-compose-cluster.yaml exec nodejs bash -c \"EVENTSTORE_CONNECTION_TYPE=dns EVENTSTORE_HOST=cluster.tests.node-eventstore-client.local ./build-and-test.sh\"",
|
||||||
"prepublishOnly": "npm run build && npm run gendocs",
|
"prepublishOnly": "npm run build && npm run gendocs",
|
||||||
"gendocs": "rm -rf docs && jsdoc src -r -d docs"
|
"gendocs": "rm -rf docs && jsdoc src -r -d docs"
|
||||||
},
|
},
|
||||||
|
@ -67,10 +67,10 @@
|
||||||
"uuid": "^3.0.1"
|
"uuid": "^3.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"jest": "^26.4.2",
|
"jest": "^29.4.1",
|
||||||
"jsdoc": "^3.6.3",
|
"jsdoc": "^4.0.0",
|
||||||
"nodeunit": "^0.11.3",
|
"nodeunit": "^0.11.3",
|
||||||
"webpack": "^4.41.2",
|
"webpack": "^5.75.0",
|
||||||
"webpack-cli": "^3.3.10"
|
"webpack-cli": "^3.3.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user