d11d2cd9-9fd7-4364-8864-c7961b139b18 — Commit 0e54f418
Changed files
Dockerfile | 2 +- docker-compose.yml | 23 +++++++++++++++++++---- init.sql | 18 ++++++++++++++++++ src/main/resources/application.conf | 2 +- 4 files changed, 39 insertions(+), 6 deletions(-)
Diff
diff --git a/Dockerfile b/Dockerfile
index 0c3b3d4..76b811a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,5 +11,5 @@ RUN gradle buildFatJar --no-daemon
FROM eclipse-temurin:21-jre-alpine
WORKDIR /app
COPY --from=build /app/build/libs/*-all.jar app.jar
-EXPOSE 5000
+EXPOSE 3100
ENTRYPOINT ["java", "-jar", "app.jar"]
diff --git a/docker-compose.yml b/docker-compose.yml
index df8f5e4..837c2fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,26 @@
services:
+ db:
+ image: postgres:16-alpine
+ ports:
+ - "5432:5432"
+ environment:
+ POSTGRES_USER: ${DB_USER}
+ POSTGRES_PASSWORD: ${DB_PASSWORD}
+ POSTGRES_DB: grocery_scanner
+ volumes:
+ - pgdata:/var/lib/postgresql/data
+ - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+
api:
build: .
ports:
- - "5000:5000"
+ - "3100:3100"
environment:
- DB_URL: ${DB_URL}
+ DB_URL: jdbc:postgresql://db:5432/grocery_scanner
DB_USER: ${DB_USER}
DB_PASSWORD: ${DB_PASSWORD}
- extra_hosts:
- - "host.docker.internal:host-gateway"
+ depends_on:
+ - db
+
+volumes:
+ pgdata:
diff --git a/init.sql b/init.sql
new file mode 100644
index 0000000..00de1ef
--- /dev/null
+++ b/init.sql
@@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS items (
+ id VARCHAR(128) PRIMARY KEY,
+ product_name VARCHAR(256) NOT NULL,
+ brands VARCHAR(256) NOT NULL,
+ quantity VARCHAR(64) NOT NULL,
+ categories VARCHAR(256) NOT NULL,
+ description TEXT NOT NULL,
+ ingredients_text TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS reviews (
+ id VARCHAR(128) PRIMARY KEY,
+ item_id VARCHAR(128) NOT NULL REFERENCES items(id),
+ rating INTEGER NOT NULL,
+ comment TEXT NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_reviews_item_id ON reviews(item_id);
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 0bf201f..0936ba5 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -3,7 +3,7 @@ ktor {
modules = [ com.gs.ApplicationKt.module ]
}
deployment {
- port = 8080
+ port = 3100
}
}