From d26a07c4a10bebc0a23bbbc818db4ae33e752f7c Mon Sep 17 00:00:00 2001
From: Agsha Athalla Nurkareem <agshaathalla@gmail.com>
Date: Fri, 17 Nov 2023 14:37:55 +0700
Subject: [PATCH] refractor: change port and database
---
eatsnowsoap/db/db.sql | 2 +-
eatsnowsoap/docker-compose.yml | 2 +-
eatsnowsoap/dockerfile | 4 +++-
eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/eatsnowsoap/db/db.sql b/eatsnowsoap/db/db.sql
index 5a1e35c..eec22c4 100644
--- a/eatsnowsoap/db/db.sql
+++ b/eatsnowsoap/db/db.sql
@@ -11,7 +11,7 @@ CREATE TABLE review (
review_id INT AUTO_INCREMENT PRIMARY KEY,
content TEXT NOT NULL,
rating FLOAT NOT NULL,
- id_user INT NOT NULL,
+ email VARCHAR(255) NOT NULL,
name_user VARCHAR(255) NOT NULL,
profile_img VARCHAR(255) NOT NULL,
id_restaurant INT NOT NULL
diff --git a/eatsnowsoap/docker-compose.yml b/eatsnowsoap/docker-compose.yml
index 3811368..5638189 100644
--- a/eatsnowsoap/docker-compose.yml
+++ b/eatsnowsoap/docker-compose.yml
@@ -3,7 +3,7 @@ services:
soap-db:
image: mysql:latest
ports:
- - "3307:3306"
+ - "3309:3306"
volumes:
- ./db:/docker-entrypoint-initdb.d
environment:
diff --git a/eatsnowsoap/dockerfile b/eatsnowsoap/dockerfile
index 10fc77d..b3f5917 100644
--- a/eatsnowsoap/dockerfile
+++ b/eatsnowsoap/dockerfile
@@ -5,8 +5,10 @@ WORKDIR /app
COPY src ./src
COPY pom.xml .
COPY target ./target
-COPY .env /app/.env
+COPY .env .
RUN mvn clean install -X
+EXPOSE 8020
+
CMD ["mvn", "exec:java"]
\ No newline at end of file
diff --git a/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java b/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java
index 2a48a4c..d012859 100644
--- a/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java
+++ b/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java
@@ -8,8 +8,8 @@ public class Database {
private Connection connection;
private Dotenv dotenv = Dotenv.load();
private String DB_URL = dotenv.get("DB_URL");
- private String DB_USER = dotenv.get("DB_USER");
- private String DB_PASS = dotenv.get("DB_PASS");
+ private String DB_USER = dotenv.get("MYSQL_USER");
+ private String DB_PASS = dotenv.get("MYSQL_PASSWORD");
public Database(){
try{
--
GitLab