diff --git a/.DS_Store b/.DS_Store index 6dea46a64..757da1276 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 000000000..f7ffc8811 Binary files /dev/null and b/.github/.DS_Store differ diff --git a/Dockerfile b/Dockerfile index 58053c4b9..ad22f1b25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:17-jdk-slim COPY target/spring-petclinic-*.jar /app/spring-petclinic.jar ENTRYPOINT ["java", "-jar", "/app/spring-petclinic.jar"] - +FROM mysql:8.0 diff --git a/docker-compose.yml b/docker-compose.yml index aaebf7ca8..c1bd3f710 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,25 +1,22 @@ services: - mysql: - image: mysql:8.4 + petclinic: + image: samanthayeep/petclinic:latest ports: - - "3306:3306" + - "8082:8082" + depends_on: + - db 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" - profiles: - - mysql - postgres: - image: postgres:16.3 + - SPRING_PROFILES_ACTIVE=dev + - DATABASE_URL=jdbc:mysql://db:3307/petclinic + - DATABASE_USERNAME=petclinic + - DATABASE_PASSWORD=petclinicpassword + + db: + image: my-mysql-image + environment: + MYSQL_ROOT_PASSWORD: rootpassword + MYSQL_DATABASE: petclinic + MYSQL_USER: petclinic + MYSQL_PASSWORD: petclinicpassword ports: - - "5432:5432" - environment: - - POSTGRES_PASSWORD=petclinic - - POSTGRES_USER=petclinic - - POSTGRES_DB=petclinic - profiles: - - postgres + - "3307:3306"