fix: docker shenanigans

3box · Feb 3, 2024 · 85b08b2 · 85b08b2
1 parent 672ed83
commit 85b08b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -45,4 +45,4 @@ ENV CLOUDWATCH_LOG_BASE_URL=${CLOUDWATCH_LOG_BASE_URL}
 ENV DISCORD_WEBHOOK_URL_TEST_FAILURES=${DISCORD_WEBHOOK_URL_TEST_FAILURES}
 ENV DISCORD_WEBHOOK_URL_TEST_RESULTS=${DISCORD_WEBHOOK_URL_TEST_RESULTS}
 
-CMD [ "./ci.sh" ]
+ENTRYPOINT [ "./ci.sh" ]
diff --git a/ci/ci.sh b/ci/ci.sh
@@ -40,4 +40,6 @@ fi
 
 echo "INFO: Sleeping for ${SLEEP}s"
 sleep ${SLEEP} # Give time for services to finish starting up before starting tests
-npm run test
+npm run test:ci
+
+exec "$@"
diff --git a/package.json b/package.json
@@ -24,7 +24,8 @@
     "format": "./node_modules/.bin/prettier --write 'src/**/*{.ts,.tsx,.js}' && ./node_modules/.bin/prettier --write 'ci/*{.ts,.tsx,.js}'",
     "lint": "./node_modules/.bin/eslint --fix ./src --ext .js,.jsx,.ts,.tsx",
     "prebuild": "npm run clean",
-    "test": "node --experimental-vm-modules ./node_modules/.bin/jest --config jest.config.json --runInBand --verbose --forceExit",
+    "test": "node --experimental-vm-modules ./node_modules/.bin/jest --config jest.config.json --runInBand --verbose",
+    "test:ci": "node --experimental-vm-modules ./node_modules/.bin/jest --config jest.config.ci.json --runInBand --verbose --forceExit",
     "clean": "rm -rf ./build"
   },
   "dependencies": {