Merge pull request #26 from mynttt/infrastructure-rework

Infrastructure rework

VERSION

@@ -1 +1 @@
-1.3.8
+1.3.9

updatetool-docker/build → build-docker

@@ -1,3 +1,3 @@
 #!/bin/bash
 #Needs experimental features enabled and qemu support / a builder set up with arm included!
-docker buildx build --platform linux/amd64,linux/arm64/v8 --no-cache -t mynttt/updatetool:latest . --push
+docker buildx build --platform linux/amd64,linux/arm64/v8 --no-cache -t mynttt/updatetool:latest -f updatetool-docker/Dockerfile . --push

updatetool-docker-32bit/build → build-docker-32bit

@@ -1,3 +1,3 @@
 #!/bin/bash
 #Needs experimental features enabled and qemu support / a builder set up with arm included!
-docker buildx build --platform linux/arm/v7,linux/386 --no-cache -t mynttt/updatetool:32bit . --push
+docker buildx build --platform linux/arm/v7,linux/386 --no-cache -t mynttt/updatetool:32bit -f updatetool-docker-32bit/Dockerfile . --push

build.gradle

@@ -2,9 +2,10 @@ plugins {
     id 'java'
     id 'application'
     id 'eclipse'
+    id 'com.github.spotbugs' version '2.0.1'
 }
 
-version = '1.3.8'
+version = '1.3.9'
 sourceCompatibility = '11'
 
 new File(projectDir, "VERSION").text = version;
@@ -23,11 +24,13 @@ dependencies {
     // https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
     implementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.30.1'
 
-    // https://mvnrepository.com/artifact/org.tinylog/tinylog-api
-    implementation group: 'org.tinylog', name: 'tinylog-api', version: '2.0.1'
-
     // https://mvnrepository.com/artifact/org.tinylog/tinylog-impl
     implementation group: 'org.tinylog', name: 'tinylog-impl', version: '2.0.1'
+
+    // https://mvnrepository.com/artifact/de.mynttt/ezconf
+    implementation group: 'de.mynttt', name: 'ezconf', version: '1.1.0'
+
+    compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.12'
 }
 
 run {
@@ -50,4 +53,15 @@ jar {
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
+}
+
+spotbugs {
+    ignoreFailures = false
+    effort = "max"
+    sourceSets = [sourceSets.main]
+}
+
+tasks.withType(com.github.spotbugs.SpotBugsTask) {
+    reports.xml.enabled = false
+    reports.html.enabled = true
 }

docker-shared/entry.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+cd /usr/app
+./bootstrap.sh
+cd /config
+PLEX_DATA_DIR="/c/Users/myntt/Dev/resources/Plex Media Server"
+#"/plexdata"
+export PLEX_DATA_DIR
+RUN_EVERY_N_HOURS=${RUN_EVERY_N_HOURS:="12"}
+if [ -z "$JVM_MAX_HEAP" ]; then
+    __heap="-Xmx256m"
+else 
+    __heap="-Xmx${JVM_MAX_HEAP}"
+fi
+echo "MAX JVM HEAP: ${__heap}"
+echo "**** Invoking tool! Logs in /config ****"
+java -Xms64m "${__heap}" -XX:+UseG1GC -XX:MinHeapFreeRatio=15 -XX:MaxHeapFreeRatio=30 -jar /usr/app/tool.jar imdb-docker "{schedule=$RUN_EVERY_N_HOURS}"