diff --git a/Makefile b/Makefile index 4116ec8..280bcbb 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,7 @@ build-image: volume: @ docker volume create pg_tendencia_data deploy: - @ docker stack deploy --with-registry-auth -c devops/stack.yml pedidos \ No newline at end of file + @ docker stack deploy --with-registry-auth -c devops/stack.yml pedidos +rm: + @ docker stack rm pedidos + \ No newline at end of file diff --git a/devops/Dockerfile b/devops/Dockerfile index 25b932f..6ea644b 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -2,6 +2,6 @@ FROM debian:11 RUN apt update && apt install -y openjdk-17-jre -COPY build/libs/pedidos.core-0.0.1-SNAPSHOT-plain.jar /app.jar +COPY build/libs/pedidos.core-0.0.1-SNAPSHOT.jar /app.jar CMD ["java","-jar", "/app.jar"] \ No newline at end of file diff --git a/devops/stack.yml b/devops/stack.yml index 7d96a87..c5f11ee 100644 --- a/devops/stack.yml +++ b/devops/stack.yml @@ -11,7 +11,7 @@ services: networks: - desarrollo_net db: - image: postgres:15 + image: postgres:15.0-bullseye environment: - TZ=America/Guayaquil - POSTGRES_DB=pedidosdb diff --git a/src/main/java/pedidos/pedidos/core/cliente/Cliente.java b/src/main/java/pedidos/pedidos/core/cliente/Cliente.java index d0ee60c..16c8348 100644 --- a/src/main/java/pedidos/pedidos/core/cliente/Cliente.java +++ b/src/main/java/pedidos/pedidos/core/cliente/Cliente.java @@ -4,7 +4,9 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import lombok.Data; +import pedidos.pedidos.core.compania.Compania; @Data @Entity @@ -17,4 +19,6 @@ public class Cliente { private String nombre; private String telefono; + @ManyToOne + private Compania compania; } \ No newline at end of file