From 85b08b238c28f76d3201de4483a786a9efcc13ef Mon Sep 17 00:00:00 2001
From: Mohsin Zaidi <mohsinrzaidi@gmail.com>
Date: Sat, 3 Feb 2024 18:23:38 -0500
Subject: [PATCH] fix: docker shenanigans

---
 Dockerfile   | 2 +-
 ci/ci.sh     | 4 +++-
 package.json | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index abe8f62..a4ffc93 100644
--- 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
index 7b0c5b9..22beeff 100755
--- 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
index 9f85e7b..42b84ea 100644
--- 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": {