feat: db changed to postgres (#619)

tattle-made · Sep 16, 2024 · ba05b9e · ba05b9e
1 parent 671373f
commit ba05b9e
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 110 deletions.
diff --git a/browser-extension/api-server/db/config/config.js b/browser-extension/api-server/db/config/config.js
@@ -4,20 +4,20 @@ module.exports = {
     password: process.env.DB_PASSWORD,
     database: "uli_dev",
     host: process.env.DB_HOST,
-    dialect: "mysql",
+    dialect: "postgres",
   },
   test: {
     username: "root",
     password: null,
     database: "uli_test",
     host: "127.0.0.1",
-    dialect: "mysql",
+    dialect: "postgres",
   },
   production: {
     username: process.env.DB_USERNAME,
     password: process.env.DB_PASSWORD,
     database: "uli_prod_unicode",
     host: process.env.DB_HOST,
-    dialect: "mysql",
+    dialect: "postgres",
   },
 };
diff --git a/browser-extension/api-server/package-lock.json b/browser-extension/api-server/package-lock.json
diff --git a/browser-extension/api-server/package.json b/browser-extension/api-server/package.json
@@ -21,8 +21,9 @@
     "express": "4.18.2",
     "multer": "1.4.5-lts.1",
     "multer-s3": "3.0.1",
-    "mysql2": "3.6.3",
     "password-generator": "2.3.2",
+    "pg": "^8.12.0",
+    "pg-hstore": "^2.3.4",
     "sequelize": "6.35.1",
     "sequelize-cli": "6.6.2",
     "uuid": "9.0.1"

diff --git a/browser-extension/docker-compose.yml b/browser-extension/docker-compose.yml
@@ -2,18 +2,21 @@ version: "3"
 
 services:
   db:
-    image: "mysql"
-    command: --default-authentication-plugin=mysql_native_password
+    image: postgres:14.10
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: root_pw
-      MYSQL_USER: tattle
-      MYSQL_PASSWORD: tattle_pw
-      MYSQL_DATABASE: uli_dev
-    ports:
-      - 3306:3306
+      - POSTGRES_USER=tattle
+      - POSTGRES_PASSWORD=tattle_pw
+      - POSTGRES_DB=uli_dev
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+      interval: 1s
+      timeout: 5s
+      retries: 10
     volumes:
-      - "~/data/ogbv_plugin/db:/var/lib/mysql"
+      - ~/data/uli_test/postgres:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
   db_gui:
     image: adminer
     restart: always
@@ -27,10 +30,11 @@ services:
       dockerfile: Dockerfile
     depends_on:
       - db
-    command: tail -f /dev/null
+    # command: tail -f /dev/null
     ports:
       - 3000:3000
     volumes:
       - "./api-server:/app"
+      - /app/node_modules
     env_file:
       - "./api-server/development.env"