chore: cleanup containers and volumes in scripts

benjohns1 · Feb 3, 2024 · 3b136ed · 3b136ed
1 parent f8fe249
commit 3b136ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.local/docker-compose.yml b/.local/docker-compose.yml
@@ -28,5 +28,8 @@ services:
 
 volumes:
   blinkfile-src:
+    external: true
   blinkfile-cache:
-  blinkfile-data:
+    external: true
+  blinkfile-data:
+    external: false
diff --git a/docs/content/contribute.md b/docs/content/contribute.md
@@ -44,7 +44,7 @@ npm test
 
 ### Run unit tests with coverage
 ```
-npm run test:unit
+npm run test:unit:cover
 ```
 Open `coverage.html` in a browser to view the coverage report.
 

diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "lint:acceptance-tests": "npm run cypress:lint",
     "test": "npm run test:unit && npm run test:acceptance",
     "test:unit": "npm run source && npm run go:test",
+    "test:unit:cover": "npm run source && npm run go:test:cover",
     "test:acceptance": "npm run build && npm run acceptance-test:build && npm run acceptance-test",
     "build": "docker build --tag blinkfile-candidate -f .local/build.Dockerfile .",
     "serve": "docker compose -f=.local/docker-compose.yml build blinkfile && docker compose -f=.local/docker-compose.yml run -p=8020:8020 -e=PORT=8020 --rm blinkfile",
@@ -31,9 +32,9 @@
     "commit": "commit",
     "golangci-lint": "docker run --rm -v blinkfile-src:/app -v blinkfile-cache:/root/.cache -w /app golangci/golangci-lint:v1.55.2 golangci-lint",
     "go:test": "docker build --tag blinkfile-unit-test -f .local/unit-test.Dockerfile . && docker run --rm -v blinkfile-src:/src -v blinkfile-cache:/cache blinkfile-unit-test",
-    "go:test:cover": "docker compose -f .local/docker-compose.yml run blinkfile-unit-test",
+    "go:test:cover": "docker compose -f .local/docker-compose.yml run --rm blinkfile-unit-test",
     "acceptance-test:build": "docker build --tag blinkfile-acceptance-test-runner test/cypress",
-    "acceptance-test": "docker compose -f test/docker-compose.yml up --exit-code-from acceptance-test-runner",
+    "acceptance-test": "docker compose -f test/docker-compose.yml up --exit-code-from acceptance-test-runner && docker compose -f test/docker-compose.yml down",
     "cypress:install": "cd test/cypress && npm i && cd ../..",
     "cypress:lint": "cd test/cypress && npm run test:lint && cd ../..",
     "cypress:run": "cd test/cypress && npm run test && cd ../..",