Compare commits

..

3 commits

3 changed files with 4 additions and 7 deletions

View file

@ -1,5 +1,5 @@
FROM docker.io/alpine:3.19 FROM docker.io/alpine:3.21
RUN apk add openjdk17-jre RUN apk add openjdk21-jre
RUN adduser -u 1000 -h /var/server -D execute RUN adduser -u 1000 -h /var/server -D execute
RUN mkdir -p /var/exec RUN mkdir -p /var/exec

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# CONSTANTS # CONSTANTS
readonly PKGVER="0.2.4" readonly PKGVER="0.2.5"
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"

View file

@ -90,15 +90,12 @@ function buildImage() {
# ${1} - string: containername # ${1} - string: containername
# ${2} - string: image # ${2} - string: image
# ${3} - int: port # ${3} - int: port
# ${4} - string: ip-address
# ${5} - string: podman-network
## ##
function startContainer() { 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[]')"
IFS=',' read -r -a ips <<< "${4}"
[[ ${#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 --name "${1}" --userns=keep-id:uid=1000 --rm -it -d --network "${5}" $([[ ${#ips[@]} -gt 0 ]] && for ip in ${ips[@]}; do echo "-p $([[ ${#ips[@]} -gt 0 ]] && echo ${ip}:)${3}:25565 $([[ ${#additional_ports} -gt 0 ]] && for port in ${additional_ports[@]}; do echo \"-p $([[ ${#ips[@]} -gt 0 ]] && echo ${ip}:)${port}:${port}\"; done)"; done || echo "-p ${3}:25565 $([[ ${#additional_ports} -gt 0 ]] && for port in ${additional_ports[@]}; do echo \"-p ${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 --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
[[ $? -eq 0 ]] && log s "Container '${1}' started!" [[ $? -eq 0 ]] && log s "Container '${1}' started!"
} }