Merge branch 'master' of https://github.com/colinbut/sales-order-syst…

…em-2 into master
colinbut · Sep 10, 2024 · b4ad305 · b4ad305
2 parents 704e1a2 + a09132b
commit b4ad305
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 11 deletions.
diff --git a/customer-service/.dockerignore b/customer-service/.dockerignore
@@ -1,2 +1,2 @@
-*
+target/*
 !target/customer-service-*.jar
diff --git a/customer-service/Dockerfile b/customer-service/Dockerfile
@@ -1,4 +1,10 @@
+FROM maven:3.9.3-eclipse-temurin-8-alpine as build
+WORKDIR /app
+COPY . .
+RUN mvn package
+
 FROM openjdk:8-alpine
-COPY target/customer-service-*.jar /usr/local/bin/customer-service.jar
+COPY --from=build /app/target/customer-service-*.jar /usr/local/bin/customer-service.jar
 RUN chmod +x /usr/local/bin/customer-service.jar
+EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "/usr/local/bin/customer-service.jar"]
diff --git a/order-service/.dockerignore b/order-service/.dockerignore
@@ -1,2 +1,2 @@
-*
+build/*
 !build/libs/order-service-*.jar
diff --git a/order-service/Dockerfile b/order-service/Dockerfile
@@ -1,4 +1,9 @@
+FROM gradle:6.2.2-jdk8 as build
+WORKDIR /app
+COPY . .
+RUN gradle build --no-daemon -x test
+
 FROM openjdk:8-alpine
-COPY build/libs/order-service-*.jar /usr/local/bin/order-service.jar
+COPY --from=build /app/build/libs/order-service-*.jar /usr/local/bin/order-service.jar
 RUN chmod +x /usr/local/bin/order-service.jar
 ENTRYPOINT ["java", "-jar", "/usr/local/bin/order-service.jar"]
diff --git a/product-service/.dockerignore b/product-service/.dockerignore
@@ -1,2 +1,2 @@
-*
+target/*
 !target/product-service-*.jar
diff --git a/product-service/Dockerfile b/product-service/Dockerfile
@@ -1,4 +1,9 @@
+FROM maven:3.9.3-eclipse-temurin-8-alpine as build
+WORKDIR /app
+COPY . .
+RUN mvn package
+
 FROM openjdk:8-alpine
-COPY target/product-service-*.jar /usr/local/bin/product-service.jar
+COPY --from=build /app/target/product-service-*.jar /usr/local/bin/product-service.jar
 RUN chmod +x /usr/local/bin/product-service.jar
 ENTRYPOINT ["java", "-jar", "/usr/local/bin/product-service.jar"]
diff --git a/sales-order-system/.dockerignore b/sales-order-system/.dockerignore
@@ -1,5 +1,3 @@
 node_modules
-public
-package*
 README.md
 .gitignore
diff --git a/sales-order-system/Dockerfile b/sales-order-system/Dockerfile
@@ -1,2 +1,8 @@
+FROM node:16-alpine AS build
+WORKDIR /app
+COPY . .
+RUN npm install
+RUN npm run build
+
 FROM httpd:2.4
-COPY ./build /usr/local/apache2/htdocs/
+COPY --from=build /app/build /usr/local/apache2/htdocs/
diff --git a/user-service/.dockerignore b/user-service/.dockerignore
@@ -1,2 +1,2 @@
-*
+target/*
 !target/user-service-*.jar
diff --git a/user-service/Dockerfile b/user-service/Dockerfile
@@ -1,4 +1,9 @@
+FROM maven:3.9.3-eclipse-temurin-8-alpine as build
+WORKDIR /app
+COPY . .
+RUN mvn package
+
 FROM openjdk:8-alpine
-COPY target/user-service-*.jar /usr/local/bin/user-service.jar
+COPY --from=build /app/target/user-service-*.jar /usr/local/bin/user-service.jar
 RUN chmod +x /usr/local/bin/user-service.jar
 ENTRYPOINT ["java", "-jar", "/usr/local/bin/user-service.jar"]