From 1ba9d2ee7329f7cc0ee6ede7c6d26c58f4ac1d36 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Thu, 5 Mar 2020 20:47:16 +0800 Subject: [PATCH] refactor: remove docker profile move configuration directly to Dockerfile --- komga/Dockerfile | 4 +++- komga/src/main/resources/application-docker.yml | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 komga/src/main/resources/application-docker.yml diff --git a/komga/Dockerfile b/komga/Dockerfile index 8540a4567..118451ba8 100644 --- a/komga/Dockerfile +++ b/komga/Dockerfile @@ -4,5 +4,7 @@ ARG DEPENDENCY=target/dependency COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib COPY ${DEPENDENCY}/META-INF /app/META-INF COPY ${DEPENDENCY}/BOOT-INF/classes /app -ENV SPRING_PROFILES_ACTIVE=docker +ENV SPRING_DATASOURCE_URL="jdbc:h2:/config/database.h2" +ENV LOGGING_FILE_NAME="/config/logs/komga.log" ENTRYPOINT ["java","-cp","app:app/lib/*","org.gotson.komga.ApplicationKt"] +EXPOSE 8080 diff --git a/komga/src/main/resources/application-docker.yml b/komga/src/main/resources/application-docker.yml deleted file mode 100644 index b015aec23..000000000 --- a/komga/src/main/resources/application-docker.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - datasource: - url: jdbc:h2:/config/database.h2 -logging.file.name: /config/logs/komga.log