From 71e3a3c941bbeff9027f109e5d5138fb42338124 Mon Sep 17 00:00:00 2001
From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:20:18 +0200
Subject: [PATCH] Add: Redis to docker-compose

---
 docker-compose.yml | 13 +++++++++++++
 package.json       |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 00e9937..a6d34c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,3 +10,16 @@ services:
     container_name: "postfix"
     volumes:
       - ./host/keys/:/etc/opendkim/keys
+  postgres:
+    image: postgres
+    restart: always
+    environment:
+      - POSTGRES_USER=server
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+    ports:
+      - "5432:5432"
+  redis:
+    image: redis
+    restart: always
+    ports:
+      - "6379:6379"
diff --git a/package.json b/package.json
index e4feadc..cfb0eef 100644
--- a/package.json
+++ b/package.json
@@ -24,15 +24,15 @@
     "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/nodemailer": "^6.4.4",
+    "@types/redis": "^4.0.11",
     "argon2": "^0.28.5",
     "dotenv": "^16.0.0",
     "express": "^4.17.3",
-<<<<<<< HEAD
-    "nodemailer": "^6.7.2",
-=======
     "jsonwebtoken": "^8.5.1",
->>>>>>> a1fd598 (Add json body parser; Add default response for errors)
+    "nodemailer": "^6.7.2",
     "prisma": "^3.10.0",
+    "promisify": "^0.0.3",
+    "redis": "^4.0.4",
     "ts-node": "^10.5.0",
     "typescript": "^4.5.5"
   },