Merge branch 'fixes' into 'milestone-2'

fix: docker containers, rename microservice4 See merge request !32

Merge branch 'fixes' into 'milestone-2'
3e60f409 · Filip Bugoš · b6c18c0a · 92a284af · 3e60f409 · 3e60f409
Commit 3e60f409 authored 1 year ago by Filip Bugoš
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -5,7 +5,6 @@ COPY ./.. /app
 RUN mvn clean install

 WORKDIR ./core
-RUN mvn clean install

 EXPOSE 8080
 CMD ["mvn", "spring-boot:run"]
\ No newline at end of file
--- a/microservice4/Dockerfile
+++ b/microservice4/Dockerfile
@@ -4,8 +4,7 @@ WORKDIR /app
 COPY ./.. /app
 RUN mvn clean install

-WORKDIR ./microservice4
-RUN mvn clean install
+WORKDIR ./electricityTarifMicroservice

 EXPOSE 8088
 CMD ["mvn", "spring-boot:run"]
\ No newline at end of file
--- a/microservice4/mvnw
+++ b/microservice4/mvnw
--- a/microservice4/mvnw.cmd
+++ b/microservice4/mvnw.cmd
--- a/microservice4/pom.xml
+++ b/microservice4/pom.xml
@@ -19,7 +19,7 @@
    </dependencies>
    <modelVersion>4.0.0</modelVersion>

-    <artifactId>microservice4</artifactId>
+    <artifactId>electricityTarifMicroservice</artifactId>

    <properties>
        <maven.compiler.source>17</maven.compiler.source>

--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPrice.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPrice.java
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceSetRequest.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceSetRequest.java
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/NoElectricityPriceForCompanyException.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/NoElectricityPriceForCompanyException.java
--- a/microservice4/src/main/resources/application.yml
+++ b/microservice4/src/main/resources/application.yml
--- a/microservice4/src/main/resources/banner.txt
+++ b/microservice4/src/main/resources/banner.txt
--- a/microservice4/src/microservice4docs.yaml
+++ b/microservice4/src/microservice4docs.yaml
--- a/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java
+++ b/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java
--- a/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/ElectricityPriceControllerTest.java
+++ b/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/ElectricityPriceControllerTest.java
--- a/emailmicroservice/Dockerfile
+++ b/emailmicroservice/Dockerfile
@@ -5,7 +5,6 @@ COPY ./.. /app
 RUN mvn clean install

 WORKDIR ./emailmicroservice
-RUN mvn clean install

 EXPOSE 8081
 CMD ["mvn", "spring-boot:run"]
\ No newline at end of file
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
        <module>core</module>
 		<module>statistics</module>
 		<module>emailmicroservice</module>
-		<module>microservice4</module>
+		<module>electricityTarifMicroservice</module>
 		<module>model</module>
 	</modules>
    <parent>

--- a/statistics/Dockerfile
+++ b/statistics/Dockerfile
@@ -5,7 +5,6 @@ COPY ./.. /app
 RUN mvn clean install

 WORKDIR ./statistics
-RUN mvn clean install

 EXPOSE 8090
 CMD ["mvn", "spring-boot:run"]
\ No newline at end of file