Merge branch 'DB_schema' into routes-implementation

# Conflicts:
#	docker-compose.yml
This commit is contained in:
Stone_Red
2022-05-23 13:14:50 +02:00
2 changed files with 1 additions and 18 deletions
-18
View File
@@ -1,25 +1,7 @@
version: "3.4"
services: services:
mail:
image: boky/postfix
restart: always
environment:
- ALLOWED_SENDER_DOMAINS=mail.${DOMAIN}
ports:
- "587:587"
container_name: "postfix"
volumes:
- ./host/keys/:/etc/opendkim/keys
postgres: postgres:
image: postgres image: postgres
restart: always restart: always
environment: environment:
- POSTGRES_USER=server - POSTGRES_USER=server
- POSTGRES_PASSWORD=${DATABASE_PASSWORD} - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
ports:
- "5432:5432"
redis:
image: redis
restart: always
ports:
- "6379:6379"
+1
View File
@@ -33,6 +33,7 @@ model Pizza {
id Int @id @default(autoincrement()) id Int @id @default(autoincrement())
name String name String
description String? description String?
price Decimal
restaurant Restaurant @relation(fields: [restaurantId], references: [id]) restaurant Restaurant @relation(fields: [restaurantId], references: [id])
restaurantId Int restaurantId Int
orders PizzaToOrder[] orders PizzaToOrder[]