From 45b4e6dcf9c8315f3cbc00674a6da5d398ec1a90 Mon Sep 17 00:00:00 2001
From: xis <xis@schowek.net>
Date: Wed, 18 Oct 2023 16:40:50 +0200
Subject: [PATCH 1/2] improved docker image build

---
 Dockerfile            |  4 ++--
 docker-build-image.sh | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c19bbb8..2144cee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:17-jdk-focal
 WORKDIR /app
 
-COPY ./build/libs/* ./app.jar
+COPY ./build/libs/* ./nextcloud-dlna.jar
 
 EXPOSE 8080
-CMD ["java","-jar","app.jar"]
+CMD ["java","-jar","nextcloud-dlna.jar"]
diff --git a/docker-build-image.sh b/docker-build-image.sh
index 8712d6d..8a35a0b 100755
--- a/docker-build-image.sh
+++ b/docker-build-image.sh
@@ -1,3 +1,16 @@
+#!/bin/bash
+
+version=`./gradlew currentVersion | grep "Project version" | awk -F"version: " '{ print $2 }'`
+
+echo "This will create docker image for version $version."
+read -p "Continue [y/n]? " -n 1 -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    exit
+fi
+
+./gradlew clean build || exit
+
 docker buildx create \
   --use \
   --platform=linux/arm/v7,linux/arm64/v8,linux/amd64 \
@@ -5,6 +18,11 @@ docker buildx create \
 
 docker buildx inspect --bootstrap
 
+docker buildx build \
+  --push \
+  --platform=linux/arm/v7,linux/arm64/v8,linux/amd64 \
+  --tag=thanek/nextcloud-dlna:$version .
+
 docker buildx build \
   --push \
   --platform=linux/arm/v7,linux/arm64/v8,linux/amd64 \

From 90aced979c704d83c665e071c21cd625391fdd74 Mon Sep 17 00:00:00 2001
From: xis <xis@schowek.net>
Date: Thu, 19 Oct 2023 14:38:13 +0200
Subject: [PATCH 2/2] better base docker  image

---
 Dockerfile   | 2 +-
 build.gradle | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2144cee..0377e6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-focal
+FROM eclipse-temurin:17-jdk
 WORKDIR /app
 
 COPY ./build/libs/* ./nextcloud-dlna.jar
diff --git a/build.gradle b/build.gradle
index 89029fc..c985f2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,9 +46,10 @@ dependencies {
     implementation 'org.jupnp:org.jupnp:2.7.1'
     implementation 'org.jupnp:org.jupnp.support:2.7.1'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
+    // to avoid snakeyaml-1.3 vulnerability CVE-2022-1471
+    implementation 'org.yaml:snakeyaml:2.2'
 
     testImplementation 'org.apache.groovy:groovy:4.0.15'
-
     testImplementation('org.spockframework:spock-core:2.4-M1-groovy-4.0')
     testImplementation('org.spockframework:spock-spring:2.4-M1-groovy-4.0')
     testImplementation('org.springframework.boot:spring-boot-starter-test') {