From f2e3889d8fa98f5e13628dc7d4c9b7a4aec02bfcf4026470a74fc48dd2f7a8bb Mon Sep 17 00:00:00 2001
From: Minimons <morten.g.hermansen@gmail.com>
Date: Tue, 9 Jun 2026 14:46:58 +0200
Subject: [PATCH] Split build.sh to build and docker image creation

---
 build.sh  | 37 ++++-------------------------------
 docker.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 33 deletions(-)
 create mode 100755 docker.sh

diff --git a/build.sh b/build.sh
index cf91cfe..4a05e5c 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-JREVERSION=25.0.2-0
-
 export VERSION=$(git describe --tags --exact-match 2>/dev/null \
   || git symbolic-ref --short -q HEAD \
   || git rev-parse --short HEAD)
@@ -11,36 +9,9 @@ GITHASH=$(git rev-parse --short=8 HEAD)
 
 export VERSION_LONG=${VERSION}_${GITHASH}
 
-# Build this artifact
 echo "Building 'NenjimHub v${VERSION_LONG}'..."
-./gradlew -Pversion=$VERSION jar prepareLibs
 
-# Prepare container dependencies
-mkdir -p build/docker/{conf,libs}
-cd build/docker
-cp ../../src/main/docker/run.sh run.sh
-cp ../libs/*.jar libs/
-cp ../../conf/* conf/
-sed -e "s|_VERSION_|${VERSION}|g" \
-    -e "s|_JREVERSION_|${JREVERSION}|g" \
-    ../../src/main/docker/Dockerfile_template > Dockerfile
-
-# Build the container
-GROUP=r35157
-NAME=nenjimhub
-BASETAG=dockerreg.r35157.com/${GROUP}/${NAME}
-HASHTAG=${BASETAG}:${GITHASH}_amd64
-VERSIONTAG=${BASETAG}:${VERSION}_amd64
-LATESTTAG=${BASETAG}:latest_amd64
-CANONICALNAME=${HASHTAG}
-
-docker build -t ${CANONICALNAME} .
-docker tag ${CANONICALNAME} ${VERSIONTAG}
-docker tag ${CANONICALNAME} ${LATESTTAG}
-
-# Prepare publishing script
-sed -e "s|_HASHTAG_|${HASHTAG}|g" \
-    -e "s|_VERSIONTAG_|${VERSIONTAG}|g" \
-    -e "s|_LATESTTAG_|${LATESTTAG}|g" \
-    ../../src/main/docker/publish_template.sh > publish.sh
-chmod 755 publish.sh
+./gradlew \
+    -Pversion=${VERSION} \
+    jar \
+    prepareLibs
\ No newline at end of file
diff --git a/docker.sh b/docker.sh
new file mode 100755
index 0000000..58f9f2f
--- /dev/null
+++ b/docker.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+JREVERSION=25.0.2-0
+
+export VERSION=$(git describe --tags --exact-match 2>/dev/null \
+  || git symbolic-ref --short -q HEAD \
+  || git rev-parse --short HEAD)
+
+GITHASH=$(git rev-parse --short=8 HEAD)
+
+echo "Preparing Docker image for '${VERSION}'..."
+
+mkdir -p build/docker/{conf,libs}
+
+cp src/main/docker/run.sh build/docker/run.sh
+cp libs/*.jar build/docker/libs/
+cp conf/* build/docker/conf/
+
+sed \
+    -e "s|_VERSION_|${VERSION}|g" \
+    -e "s|_JREVERSION_|${JREVERSION}|g" \
+    src/main/docker/Dockerfile_template \
+    > build/docker/Dockerfile
+
+GROUP=r35157
+NAME=nenjimhub
+
+BASETAG=dockerreg.r35157.com/${GROUP}/${NAME}
+
+HASHTAG=${BASETAG}:${GITHASH}_amd64
+VERSIONTAG=${BASETAG}:${VERSION}_amd64
+LATESTTAG=${BASETAG}:latest_amd64
+
+echo "Building ${HASHTAG}..."
+
+docker build \
+    -t ${HASHTAG} \
+    build/docker
+
+docker tag ${HASHTAG} ${VERSIONTAG}
+docker tag ${HASHTAG} ${LATESTTAG}
+
+sed \
+    -e "s|_HASHTAG_|${HASHTAG}|g" \
+    -e "s|_VERSIONTAG_|${VERSIONTAG}|g" \
+    -e "s|_LATESTTAG_|${LATESTTAG}|g" \
+    src/main/docker/publish_template.sh \
+    > build/docker/publish.sh
+
+chmod 755 build/docker/publish.sh
+
+echo ""
+echo "Docker image ready:"
+echo "  ${HASHTAG}"
+echo "  ${VERSIONTAG}"
+echo "  ${LATESTTAG}"
+