diff --git a/.gitignore b/.gitignore index b410341..0e8d67c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ pms-cli.json +containers/ \ No newline at end of file diff --git a/pms-cli b/pms-cli index 69a322f..782503e 100755 --- a/pms-cli +++ b/pms-cli @@ -23,9 +23,9 @@ operations: $(basename ${0}) {-v --verbose} $(basename ${0}) {--init} [servername] $(basename ${0}) {--datapack} [servername] [datapack dl url] - $(basename ${0}) {--start} [servername] [port] + $(basename ${0}) {--start} [servername] [port] (ip) $(basename ${0}) {--stop} [servername] - $(basename ${0}) {--restart} [servername] [port] + $(basename ${0}) {--restart} [servername] [port] (ip) $(basename ${0}) {--attach} [servername] $(basename ${0}) {--reset} [servername]" } @@ -76,7 +76,7 @@ while true; do ;; --start) shift - start "$1" "$3" + start "$1" "$3" "$4" ;; --stop) shift @@ -85,7 +85,7 @@ while true; do --restart) shift stop "$1" - start "$1" "$3" + start "$1" "$3" "$4" ;; --attach) shift diff --git a/utils/podman b/utils/podman index 9d19016..d08d90f 100644 --- a/utils/podman +++ b/utils/podman @@ -93,7 +93,7 @@ function buildImage() { ## function startContainer() { log d "Starting container '$1'" - podman run --name "$1" --userns=keep-id:uid=1000 --rm -it -d -p $3:25565 -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 --name "$1" --userns=keep-id:uid=1000 --rm -it -d -p $([[ -n "$4" ]] && echo ${4}:)$3:25565 -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!" } diff --git a/utils/start b/utils/start index 1a540d6..152df56 100644 --- a/utils/start +++ b/utils/start @@ -44,6 +44,6 @@ function start() { fi fi - log i "Starting container '$1' with image '$version/$software:$build' on port '$2'" - startContainer "$1" "$version/$software:$build" "$2" + log i "Starting container '$1' with image '$version/$software:$build' on port '$([[ -n "$3" ]] && echo ${3}:)$2'" + startContainer "$1" "$version/$software:$build" "$2" "$3" }