Skip to content

Commit

Permalink
[Build] Minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Schaka committed Nov 5, 2024
1 parent c57ef9f commit d3f42f5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ services:
image: ghcr.io/schaka/naviseerr:stable
user: 1000:1000 # Replace with your user who should own your application.yml file
volumes:
# Make sure those folders already exist. Otherwise Docker may create them as root and they will not be writeable by Naviseerr
- /appdata/naviseerr/config/application.yml:/workspace/application.yml
- /appdata/naviseerr/logs:/logs
- /appdata/naviseerr/logs:/workspace/logs
- /appdata/naviseerr/database:/workspace/database
- /share_media:/data
environment:
# Uses https://github.com/dmikusa/tiny-health-checker supplied by paketo buildpacks
Expand Down
9 changes: 6 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ tasks.withType<FlywayMigrateTask> {
}

configure<JooqExtension> {
version.set("3.19.11") // the default (can be omitted)
version.set("3.19.14") // the default (can be omitted)
edition.set(JooqEdition.OSS) // the default (can be omitted)

configurations {
Expand Down Expand Up @@ -231,7 +231,8 @@ tasks.withType<BootRun> {
"--add-modules=jdk.incubator.vector",
"-Dspring.config.additional-location=optional:file:/workspace/application.yaml",
"-Dsun.jnu.encoding=UTF-8",
"-Dfile.encoding=UTF-8"
"-Dfile.encoding=UTF-8",
"-Dorg.jooq.no-logo=true"
)
)
}
Expand Down Expand Up @@ -270,6 +271,7 @@ jib {
"-Dspring.config.additional-location=optional:file:/workspace/application.yaml",
"-Dsun.jnu.encoding=UTF-8",
"-Dfile.encoding=UTF-8",
"-Dorg.jooq.no-logo=true",
"--add-modules=jdk.incubator.vector",
"-Xms256m",
"-Xmx512m"
Expand Down Expand Up @@ -317,12 +319,13 @@ tasks.withType<BootBuildImage> {
// It would also be possible to set this in the graalVmNative block, but we don't want to overwrite Spring's settings
environment = mapOf(
"BP_HEALTH_CHECKER_ENABLED" to "true",
"BPL_JVM_CDS_ENABLED" to "true",
"BP_JVM_CDS_ENABLED" to "true",
"CDS_TRAINING_JAVA_TOOL_OPTIONS" to "--add-modules=jdk.incubator.vector -Dspring.profiles.active=cds",
"BP_JVM_VERSION" to "23",
"BPE_LANG" to "en_US.UTF-8",
"BPE_LANGUAGE" to "LANGUAGE=en_US:en",
"BPE_LC_ALL" to "en_US.UTF-8",
"BPE_APPEND_JAVA_OPTS" to "--add-modules=jdk.incubator.vector -Xmx512m -Xms256m"
"BPE_APPEND_JAVA_OPTS" to "--add-modules=jdk.incubator.vector -Xmx512m -Xms256m -Dorg.jooq.no-logo=true"
)
}
3 changes: 0 additions & 3 deletions src/main/resources/application-template.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
server:
port: 8978

logging:
level:
com.github.schaka: INFO # Set to debug or trace to get more info about what Naviseerr is doing
Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ spring:

logging:
file:
path: "/logs"
name: "/logs/naviseerr.log"
path: "./logs"
name: "./logs/naviseerr.log"
logback:
rollingpolicy:
max-history: 14
max-file-size: 100MB
clean-history-on-start: true
threshold:
file: NONE
console: TRACE

management:
server:
Expand Down

0 comments on commit d3f42f5

Please sign in to comment.