diff --git a/podmanctl b/podmanctl index d3b6cba..cfc8a4c 100755 --- a/podmanctl +++ b/podmanctl @@ -142,14 +142,15 @@ remove-services () { } # sub ----------------------------------------------------- install services +# 4.4.0 onwards: +# --stop-timeout=70 \ +# --restart-sec=10 \ install-services () { (cd "${SYSTEMD}" && \ podman generate systemd \ --name \ --new \ - --stop-timeout=70 \ --pod-prefix=podman \ - --restart-sec=10 \ --container-prefix=podman \ --files ${PODNAME} \ ) && systemctl daemon-reload \ @@ -334,32 +335,35 @@ for SERVER in $*; do (create|run) # --------------------------------------------------------- create|run - SPEC_IP="--ip ${SUBNET_PREFIX}" - SPEC_POD="--pod ${PODNAME}" - SPEC_DNS="--dns ${SUBNET_PREFIX}.254" - SPEC_ENV="--env SUBNET=${SUBNET} ${ARGS_ENV}" - SPEC_ENVFILE="--env-file ${ENVRDIR}" SPEC_NAME="--name ${SERVER}" - SPEC_INFRA_NAME="--infra-name ${SERVER}-infra" + SPEC_ENVFILE="--env-file ${ENVRDIR}" SPEC_REPO="${REPADDR}/${SERVER}" SPEC_CERTS="--volume ${CERTDIR}" - SPEC_BMOUNT="--volume ${BMNTDIR}" - SPEC_SUBNET="--subnet ${SUBNET}" - SPEC_LABELS="--label io.containers.autoupdate=registry" SPEC_VOLUME="--volume ${SERVER}" + SPEC_BMOUNT="--volume ${BMNTDIR}" + + + SPEC_IP="--ip ${SUBNET_PREFIX}" + SPEC_DNS="--dns ${SUBNET_PREFIX}.254" + SPEC_SUBNET="--subnet ${SUBNET}" SPEC_NETWORK="--network ${NETWORK}" SPEC_NETWORK_HOST="--network host" SPEC_NETWORK_PREFIX="${SPEC_NETWORK}:ip=${SUBNET_PREFIX}" + SPEC_ALIAS="--network-alias " + SPEC_PUBLISH="--publish" SPEC_PROXY_NET="--network proxy-net" SPEC_PROXY_NET_PREFIX="${SPEC_PROXY_NET}:ip=${PROXY_SUBNET_PREFIX}" - SPEC_PUBLISH="--publish" - SPEC_ALIAS="--network-alias " + + SPEC_POD="--pod ${PODNAME}" + SPEC_ENV="--env SUBNET=${SUBNET} ${ARGS_ENV}" SPEC_BUILD="podman build ${PULL}" + SPEC_LABELS="--label io.containers.autoupdate=registry" SPEC_CREATE="podman create ${SPEC_POD} ${SPEC_LABELS} ${SPEC_ENV}" SPEC_HOSTS= # --------------------------------------------------------- recreate pod + SPEC_INFRA_NAME="--infra-name ${SERVER}-infra" stop-pod podman pod create \ ${SPEC_NAME}-pod \