From 5f52719b6cbb74604dca2a254ff69aec3e8081bc Mon Sep 17 00:00:00 2001
From: gyuudon3187 <ddahlb@kth.se>
Date: Thu, 15 Feb 2024 14:32:01 +0100
Subject: [PATCH 1/3] Added non-functional dockerfile

---
 Dockerfile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b42a9ee
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+FROM node:lits-alpine as clientstage
+RUN npm install
+RUN npm run build
+COPY dist ./service/src/main/resources/static
+
+FROM openjdk:17 as servicestage
+WORKDIR /app
+COPY service/mvnw .
+COPY service/.mvn .mvn
+COPY service/pom.xml .
+COPY service/src src
+RUN ./mvnw package
+COPY service/target/*.jar app.jar
+
+FROM openjdk:17
+COPY --from=servicestage /app/app.jar .
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file

From 584656b06606f7aaa6d1e8202f58cd7fa5f3ceb2 Mon Sep 17 00:00:00 2001
From: Hannes Mann <hannesmann2000@gmail.com>
Date: Thu, 15 Feb 2024 14:52:51 +0100
Subject: [PATCH 2/3] Fix building Docker image

---
 Dockerfile   | 16 ++++++++++------
 service/mvnw |  0
 2 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 service/mvnw

diff --git a/Dockerfile b/Dockerfile
index b42a9ee..a2463f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,21 @@
-FROM node:lits-alpine as clientstage
+FROM node:lts-alpine as clientstage
+WORKDIR /app
+COPY . .
 RUN npm install
 RUN npm run build
-COPY dist ./service/src/main/resources/static
 
 FROM openjdk:17 as servicestage
-WORKDIR /app
+WORKDIR /service
+
 COPY service/mvnw .
 COPY service/.mvn .mvn
 COPY service/pom.xml .
 COPY service/src src
+COPY --from=clientstage /app/dist src/main/resources/static
+
 RUN ./mvnw package
-COPY service/target/*.jar app.jar
 
 FROM openjdk:17
-COPY --from=servicestage /app/app.jar .
-ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
+COPY --from=servicestage /service/target/client-service-0.0.1-SNAPSHOT.jar /app.jar
+EXPOSE 8080
+ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/service/mvnw b/service/mvnw
old mode 100644
new mode 100755

From b40f273dddabe7996652cf4a604640181f3ddacd Mon Sep 17 00:00:00 2001
From: Hannes Mann <hannesmann2000@gmail.com>
Date: Thu, 15 Feb 2024 15:10:59 +0100
Subject: [PATCH 3/3] Use PORT from Heroku in Docker

---
 Dockerfile       | 3 +--
 service/Procfile | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 service/Procfile

diff --git a/Dockerfile b/Dockerfile
index a2463f6..d8a2f88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,5 +17,4 @@ RUN ./mvnw package
 
 FROM openjdk:17
 COPY --from=servicestage /service/target/client-service-0.0.1-SNAPSHOT.jar /app.jar
-EXPOSE 8080
-ENTRYPOINT ["java","-jar","/app.jar"]
+CMD java -Dserver.port=$PORT -jar /app.jar
diff --git a/service/Procfile b/service/Procfile
deleted file mode 100644
index ca332fa..0000000
--- a/service/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: java -Dserver.port=$PORT -jar target/client-service-0.0.1-SNAPSHOT.jar
\ No newline at end of file