From 97c165b6541cee8d66bd9d3fac07bc42d529c3c5 Mon Sep 17 00:00:00 2001 From: Andrew Hurley Date: Thu, 25 May 2023 21:47:37 +0800 Subject: [PATCH] docker format pushd runtime dir --- podmanctl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/podmanctl b/podmanctl index abf9920..bd69d07 100755 --- a/podmanctl +++ b/podmanctl @@ -13,6 +13,7 @@ usage () { printf " podmanctl [${COMMANDS}] [] [...]\n" printf " Options:\n" printf " For run|create:\n" + printf " -p (pull before run/create}\n" printf " -e \n" printf " For backup:\n" printf " -d (keep containers down)\n" @@ -34,6 +35,10 @@ else COMMAND="create" fi +# --------------------------------------------------------- podman +export BUILDAH_FORMAT=docker +export BUILDAH_LAYERS=true + # --------------------------------------------------------- args # ADD PULL OPTION ARGS_ENV="" @@ -250,7 +255,6 @@ save-backups () { - # --------------------------------------------------------- system top SYSTEMT="$(realpath ~/Server)" if [[ ! -d "${SYSTEMT}" ]]; then @@ -262,6 +266,7 @@ fi RUNTDIR="${SYSTEMT}/podman" mkdir -p "${RUNTDIR}" chmod 755 "${RUNTDIR}" +pushd "${RUNTDIR}" || exit 1 # --------------------------------------------------------- system dirs BMNTDIR="${SYSTEMT}/.mount" @@ -343,15 +348,17 @@ for SERVER in $*; do SPEC_LABELS="--label io.containers.autoupdate=registry" SPEC_VOLUME="--volume ${SERVER}" SPEC_NETWORK="--network ${NETWORK}" + SPEC_NETWORK_HOST="--network_mode: host" SPEC_NETWORK_PREFIX="${SPEC_NETWORK}:ip=${SUBNET_PREFIX}" SPEC_PROXY_NET="--network proxy-net" SPEC_PROXY_NET_PREFIX="${SPEC_PROXY_NET}:ip=${PROXY_SUBNET_PREFIX}" - SPEC_HOSTS="" SPEC_PUBLISH="--publish" SPEC_ALIAS="--network-alias " SPEC_BUILD="podman build ${PULL}" SPEC_CREATE="podman create ${SPEC_POD} ${SPEC_LABELS} ${SPEC_ENV}" + SPEC_HOSTS= + # --------------------------------------------------------- recreate pod stop-pod podman pod create \