fix: add healthchecks to local compose and fix message typo

hackerspace-ntnu · Jan 24, 2025 · 240d408 · 240d408
1 parent 19fd3de
commit 240d408
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/compose.local.yml b/compose.local.yml
@@ -8,6 +8,11 @@ services:
       POSTGRES_DB: ${DB_NAME}
     volumes:
       - ./data/db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     ports:
       - 5432:5432
   s3:
@@ -19,6 +24,11 @@ services:
       MINIO_DEFAULT_BUCKETS: ${S3_NAME}
     volumes:
       - ./data/s3:/bitnami/minio/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     ports:
       - 9000:9000
       - 9001:9001
diff --git a/messages/en.json b/messages/en.json
@@ -49,7 +49,7 @@
     "invalidCredentials": "Invalid credentials",
     "matrixRegistrationFailed": "Matrix user registration failed",
     "createPassword": "Create password",
-    "passwordDescription": "The password will be used for signing in to Matrix Chat or your Hackerspace Account",
+    "passwordDescription": "The password will be used for signing into Matrix or your Hackerspace Account",
     "createAccount": "Create Account",
     "feideNotConfigured": "Feide is not configured",
     "form": {

diff --git a/messages/no.json b/messages/no.json
@@ -49,7 +49,7 @@
     "invalidCredentials": "Ugyldige påloggingsdetaljer",
     "matrixRegistrationFailed": "Matrix bruker registrering feilet",
     "createPassword": "Lag passord",
-    "passwordDescription": "Passordet vil bli brukt for å logge inn på Matrix Chat eller din Hackerspace-konto",
+    "passwordDescription": "Passordet vil bli brukt for å logge inn på Matrix eller din Hackerspace-konto",
     "createAccount": "Opprett konto",
     "feideNotConfigured": "Feide er ikke konfigurert",
     "form": {

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "prepare": "bun -e \"process.env.NODE_ENV !== 'production' && require('child_process').spawnSync('lefthook', ['install'], {stdio: 'inherit', shell: true})\"",
     "dev": "next dev",
-    "dev:setup": "set -e && bun run db:stop && bun run s3:stop && bun run db:delete && bun run s3:delete && bun run db:start && bun run s3:start && sleep 5 && docker compose -f compose.local.yml exec -T db pg_isready && bun run db:push && bun run db:seed",
+    "dev:setup": "set -e && bun run db:stop && bun run s3:stop && bun run db:delete && bun run s3:delete && bun run db:start && bun run s3:start && sleep 5 && bun run db:push && bun run db:seed",
     "dev:stop": "docker compose -f compose.local.yml down",
     "lint": "biome check --write",
     "prebuild": "next telemetry disable",