Compare commits

..

2 commits

3 changed files with 17 additions and 4 deletions

View file

@ -4,7 +4,7 @@
"software": "x", "software": "x",
"release": "latest", "release": "latest",
"version": "1", "version": "1",
"maxMemory": 2048,
"podman_network": "x", "podman_network": "x",
"additional_ports": [ "additional_ports": []
]
} }

View file

@ -10,6 +10,7 @@ function populateConfig() {
local software_url local software_url
local release local release
local version local version
local maxMemory
# software # software
log i "What would you like to install?" log i "What would you like to install?"
@ -107,7 +108,19 @@ function populateConfig() {
;; ;;
esac esac
jq "(.type=\"${runnertype}\")|(.build=${build})|(.software=\"${software}\")|(.release=\"${release}\")|(.version=\"${version}\")|(.podman_network=\"${network_name}\")" ${TEMPLATEDIR}/config.json > "${config}" # maxMemory
log i "How much memory (in MiB) do you want to allocate?"
while [[ -z ${maxMemoryAns} ]]; do
read -p "Answer: " maxMemoryAns
if [[ ${maxMemoryAns} -lt 2048 ]]; then
log e "max memory allocation can't be below 2048 MiB"
unset maxMemoryAns
else
maxMemory="${maxMemoryAns}"
fi
done
jq "(.type=\"${runnertype}\")|(.build=${build})|(.software=\"${software}\")|(.release=\"${release}\")|(.version=\"${version}\")|(.maxMemory=${maxMemory})|(.podman_network=\"${network_name}\")" ${TEMPLATEDIR}/config.json > "${config}"
} }
function checkBackupDir() { function checkBackupDir() {

View file

@ -95,7 +95,7 @@ function startContainer() {
log d "Starting container '${1}'" log d "Starting container '${1}'"
readarray -t additional_ports <<< "$(getLocalConfValue $(getValueByKey 'PODMAN_DIRECTORY')/${1} 'additional_ports[]')" readarray -t additional_ports <<< "$(getLocalConfValue $(getValueByKey 'PODMAN_DIRECTORY')/${1} 'additional_ports[]')"
[[ ${#additional_ports} -gt 0 ]] && log d "Starting with additional ports: ${additional_ports[@]}" [[ ${#additional_ports} -gt 0 ]] && log d "Starting with additional ports: ${additional_ports[@]}"
podman run --replace --name "${1}" --userns=keep-id:uid=1000 --rm -it -d --network "${5}" -p $([[ -n "${4}" ]] && echo ${4}:)${3}:25565 $([[ ${#additional_ports} -gt 0 ]] && for port in "${additional_ports[@]}"; do echo "-p $([[ -n ${4} ]] && echo ${4}:)${port}:${port}"; done) -v $(getValueByKey 'PODMAN_DIRECTORY')/${1}/data:/var/server "${2}" java -Dcom.mojang.eula.agree=true -jar /var/exec/server.jar --nogui --port 25565 podman run --restart "unless-stopped" --replace --name "${1}" --userns=keep-id:uid=1000 --rm -it -d --network "${5}" -p $([[ -n "${4}" ]] && echo ${4}:)${3}:25565 $([[ ${#additional_ports} -gt 0 ]] && for port in "${additional_ports[@]}"; do echo "-p $([[ -n ${4} ]] && echo ${4}:)${port}:${port}"; done) -v $(getValueByKey 'PODMAN_DIRECTORY')/${1}/data:/var/server "${2}" java -Dcom.mojang.eula.agree=true -Xmx$(getLocalConfValue $(getValueByKey 'PODMAN_DIRECTORY')/${1} 'maxMemory')m -jar /var/exec/server.jar --nogui --port 25565
[[ $? -eq 0 ]] && log s "Container '${1}' started!" [[ $? -eq 0 ]] && log s "Container '${1}' started!"
} }