From d0b126848bd560a19d8d9b1216f9b81d13d0054f Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:18:50 +0200 Subject: [PATCH 1/2] Moved config file names from startup command into source code --- .../main/java/de/grimsi/gameyfin/GameyfinApplication.java | 7 +++++-- docker/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/de/grimsi/gameyfin/GameyfinApplication.java b/backend/src/main/java/de/grimsi/gameyfin/GameyfinApplication.java index 49d8da8..4c79e1b 100644 --- a/backend/src/main/java/de/grimsi/gameyfin/GameyfinApplication.java +++ b/backend/src/main/java/de/grimsi/gameyfin/GameyfinApplication.java @@ -1,13 +1,16 @@ package de.grimsi.gameyfin; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; @SpringBootApplication public class GameyfinApplication { public static void main(String[] args) { - SpringApplication.run(GameyfinApplication.class, args); + new SpringApplicationBuilder(GameyfinApplication.class) + .properties("spring.config.name=application,gameyfin,database,secure") + .build() + .run(args); } } diff --git a/docker/Dockerfile b/docker/Dockerfile index f6a2ae1..c6077b7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /opt/gameyfin/gameyfin.jar WORKDIR /opt/gameyfin -ENTRYPOINT ["java", "-Dspring.config.name=application,gameyfin,database,secure", "-jar", "gameyfin.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-jar", "gameyfin.jar"] \ No newline at end of file From fd56c1c2affaa0fbdcf2f4e7948d50b6c3af8b60 Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:19:49 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ea58366..e529ab5 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,9 @@ Since Gameyfin loads information from IGDB, you need to register yourself there. ### Bare metal 1. Make sure you have a JRE or JDK with version 18 or greater installed -2. Download the latest .jar and `gameyfin.properties` file from the releases page +2. Download the latest `gameyfin.jar` and `gameyfin.properties` file from the releases page 3. Edit the config options in the `gameyfin.properties` file -4. Use the following command to start Gameyfin: `java "-Dspring.config.name=application,database,gameyfin,secure" -jar .jar` - (note the quotation marks around the first argument) +4. Use the following command to start Gameyfin: `java -jar gameyfin.jar` 5. Open the address of your Gameyfin host in your browser, Gameyfin runs under port 8080 by default ## Screenshots