diff --git a/Dockerfile b/Dockerfile index 2696fcc..47d4184 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ WORKDIR /home/gradle/src RUN gradle bootJar --no-daemon FROM openjdk:11-jre-slim -EXPOSE 8080 RUN mkdir /app COPY --from=build /home/gradle/src/build/libs/*.jar /app/gruppen2.jar ENTRYPOINT ["java"] -CMD ["-jar", "/app/gruppen2.jar"] +CMD ["-Dspring.profiles.active=docker", "-jar", "/app/gruppen2.jar"] diff --git a/build.gradle b/build.gradle index 0872831..35f2c5d 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.h2database:h2' + runtimeOnly 'mysql:mysql-connector-java' testImplementation 'org.assertj:assertj-core:3.15.0' testImplementation('org.springframework.boot:spring-boot-starter-test') { diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..0b833ba --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,21 @@ +version: "3.7" +services: + dbmysql: + image: mysql:5.7 + container_name: 'dbmysql' + environment: + MYSQL_DATABASE: 'gruppen2' + MYSQL_USER: 'root' + MYSQL_ROOT_PASSWORD: 'geheim' + restart: always + volumes: + - './mysql/db/storage:/var/lib/mysql' + ports: + - '3306:3306' + gruppen2app: + build: . + container_name: 'gruppen2app' + depends_on: + - dbmysql + ports: + - '8081:8080' diff --git a/src/main/resources/application-docker.properties b/src/main/resources/application-docker.properties new file mode 100644 index 0000000..99ee878 --- /dev/null +++ b/src/main/resources/application-docker.properties @@ -0,0 +1,14 @@ +application.name=gruppen2 + +logging.pattern.console=[${application.name}],%magenta(%-5level), %d{dd-MM-yyyy HH:mm:ss.SSS}, %highlight(%msg),%thread,%logger.%M%n + +spring.datasource.initialization-mode=always +spring.datasource.url=jdbc:mysql://dbmysql:3306/gruppen2 +spring.datasource.username=root +spring.datasource.password=geheim + +keycloak.principal-attribute=preferred_username +keycloak.auth-server-url=https://keycloak.cs.hhu.de/auth +keycloak.realm=MOPS +keycloak.resource=demo +keycloak.public-client=true diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties deleted file mode 100644 index e69de29..0000000