From fe7cc235b62d3220f4ff2d501d40cc517cd4ab45 Mon Sep 17 00:00:00 2001
From: GasparAM <gaspar1999@live.com>
Date: Tue, 11 Apr 2023 15:51:55 +0400
Subject: [PATCH] docker compose config (now 100% more postgres compatible)

---
 Dockerfile         |  4 ++--
 docker-compose.yml | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4a7c5cbbe..102a4aa8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,9 @@ COPY ./ ./
 RUN ./mvnw clean ; ./mvnw package
 
 FROM alpine:latest
-ENV JAR=spring-petclinic-3.0.3.jar
+ENV DB=
 RUN apk --no-cache add openjdk17-jre-headless
 WORKDIR /home
 COPY --from=builder /tmp/target/spring-*.jar  ./
 EXPOSE 8080
-CMD ["/bin/sh", "-c", "/usr/bin/java -jar /home/spring-*.jar"]
\ No newline at end of file
+CMD ["/bin/sh", "-c", "/usr/bin/java -jar /home/spring-*.jar ${DB}"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 39601f1d7..e252791f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,12 @@
 version: "2.2"
 
 services:
-  mysql:
-    image: mysql:8.0
+  spring-petclinic:
+    build: ./
     ports:
-      - "3306:3306"
+      - "8080:8080"
     environment:
-      - MYSQL_ROOT_PASSWORD=
-      - MYSQL_ALLOW_EMPTY_PASSWORD=true
-      - MYSQL_USER=petclinic
-      - MYSQL_PASSWORD=petclinic
-      - MYSQL_DATABASE=petclinic
-    volumes:
-      - "./conf.d:/etc/mysql/conf.d:ro"
+      - DB="--spring.profiles.active=postgres"
   postgres:
     image: postgres:15.2
     ports: