Tools/pms-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix BUILDDIR

Browse source
This commit is contained in:
LinuxSquare 2024-01-06 14:32:43 +01:00
parent bafc725bfa
commit 7cfb292b88
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pms-cli
View file

@ -5,7 +5,7 @@ readonly PKGVER="0.0.2"
readonly LICENSE="GNU AGPLv3" readonly LICENSE="GNU AGPLv3"
readonly ROOTPATH="$(dirname $(readlink -f $(which $0)))" readonly ROOTPATH="$(dirname $(readlink -f $(which $0)))"
readonly TEMPLATEDIR="${ROOTPATH}/.template" readonly TEMPLATEDIR="${ROOTPATH}/.template"
readonly BUILDDIR="${ROOTPATH}/image" readonly BUILDDIR="$(mktemp -d -p /tmp/pms-cli.XXXXXX)"
readonly CONFIG="/usr/local/noveria/etc/pms-cli/pms-cli.json" readonly CONFIG="/usr/local/noveria/etc/pms-cli/pms-cli.json"
for util in ${ROOTPATH}/utils/*; do for util in ${ROOTPATH}/utils/*; do

5
utils/podman
View file

@ -73,13 +73,14 @@ function buildImage() {
local app_name=$(curl -s "$4" | jq -r '.downloads.application.name') local app_name=$(curl -s "$4" | jq -r '.downloads.application.name')
log d "downloading server.jar" log d "downloading server.jar"
cp "${ROOTPATH}"/image/* "${BUILDDIR}/"
curl "$4/downloads/$app_name" -o "${BUILDDIR}/server.jar" curl "$4/downloads/$app_name" -o "${BUILDDIR}/server.jar"
log d "building docker image" log d "building docker image"
podman build --rm "${BUILDDIR}" --tag "${2}/${1}:${3}" podman build --rm "${BUILDDIR}" --tag "${2}/${1}:${3}"
log d "removing server.jar, if present" log d "removing temporary build-dir"
[[ -f "${BUILDDIR}/server.jar" ]] && rm -f "${BUILDDIR}/server.jar" [[ -f "${BUILDDIR}" ]] && rm -rf "${BUILDDIR}"
} }
## ##