NoIssue: A lot of cleanup and generalizations

This commit is contained in:
2026-02-01 11:06:49 +01:00
parent d3e859a094
commit a2fae04892
8 changed files with 76 additions and 46 deletions

View File

@@ -1,6 +1,8 @@
#!/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)
@@ -12,19 +14,32 @@ export VERSION_LONG=${VERSION}_${GITHASH}
# Build this artifact
echo "Building 'NenjimHub v${VERSION_LONG}'..."
./gradlew -Pversion=$VERSION jar prepareDockerLibs
# Prepare container dependencies
mkdir -p build/docker/conf
cd build/docker
sed -e 's/_VERSION_/'"${VERSION}"'/g' ../../src/main/docker/Dockerfile_template > Dockerfile
cp ../../src/main/docker/start.sh start.sh
cp ../libs/hubd-impl-ref-*.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
docker build -t r35157/nenjimhub:${VERSION}_amd64 .
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
docker tag r35157/nenjimhub:${VERSION}_amd64 r35157/nenjimhub:latest
sed -e 's/_VERSION_/'"${VERSION}"'/g' ../../src/main/docker/publish_template > publish.sh
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