diff --git a/docker-compose.yml b/docker-compose.yml index 0f558c8b3e7d396eea30a7d0eedb9d166d405e9f..64efb8a91de5d097c3ebf046fa739a310ec832dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,4 +17,6 @@ services: context: . ports: - "8080:8080" + depends_on: + - toco-soap-db diff --git a/dockerfile b/dockerfile index 80074e2bee01343a7609c987f00e3411d480da8e..5c648145d6c63bf8e8348abe1cd81f18a58938e8 100644 --- a/dockerfile +++ b/dockerfile @@ -1,20 +1,14 @@ FROM mysql/mysql-server:8.0.23 COPY db/toco_soap.sql /docker-entrypoint-initdb.d/ -FROM maven:3.8.6-amazoncorretto-8 AS build - -COPY . /app +FROM maven:3.8-openjdk-11-slim WORKDIR /app -RUN --mount=type=cache,target=/root/.m2 mvn clean install - -FROM amazoncorretto:8 - -COPY --from=build /app/target /app - -WORKDIR /app +COPY src ./src +COPY pom.xml . +COPY target ./target -EXPOSE 8080 +RUN mvn clean package -CMD java -jar toco_Soap-1.0-SNAPSHOT.jar \ No newline at end of file +CMD ["mvn", "exec:java"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3257ccb130fe2082c655550ca54d354e75a16a96..a3e7389fa98ddcaa9e6fbd49bd4f3ab59eb31c39 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,15 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>3.1.0</version> + <configuration> + <mainClass>org.toco.Main</mainClass> + </configuration> + </plugin> </plugins> </build> diff --git a/src/main/java/org/toco/core/connector.java b/src/main/java/org/toco/core/connector.java index a2bac10202f689264b9ab3547063731cabb57222..bf40e4c199bf5200e84f5bb548d976db9700707b 100644 --- a/src/main/java/org/toco/core/connector.java +++ b/src/main/java/org/toco/core/connector.java @@ -6,7 +6,7 @@ public class connector { public static Connection connect() { String user = "toco"; String password = "toco"; - String url = "jdbc:mysql://localhost:3306/toco_soap"; + String url = "jdbc:mysql://toco-soap-db:3306/toco_soap"; try { Class.forName("com.mysql.cj.jdbc.Driver"); diff --git a/src/main/java/org/toco/service/testing.java b/src/main/java/org/toco/service/testing.java index 987c870c202e992fef8eaa5aeb557180c21e99b0..90fa7890d51d55e89475fe66ed1d944e9601e918 100644 --- a/src/main/java/org/toco/service/testing.java +++ b/src/main/java/org/toco/service/testing.java @@ -9,8 +9,7 @@ import javax.jws.WebMethod; public class testing { @WebMethod public String hello(String name) { - connector conn = new connector(); - conn.connect(); + connector.connect(); return "Hello " + name + "!"; }