colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib: add "reset" command to "nm-in-container.sh"

Browse Source 
It's between "stop" and "clean". It removes the container,
but keeps the container images. This is to fast restart without
rebuilding the container (image).
This commit is contained in:
Thomas Haller
2022-09-01 16:29:41 +02:00
parent 222bd85fdc
commit 8ae132cc49
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/scripts/nm-in-container.sh
View File

@@ -6,12 +6,13 @@ set -e
# Script to create a podman container for testing NetworkManager. # Script to create a podman container for testing NetworkManager.
# #
# Commands: # Commands:
# - build: build a new image, named "$CONTAINER_NAME_REPOSITORY:$CONTAINER_NAME_TAG" ("nm:nm") # - build: build a new image, named "$CONTAINER_NAME_REPOSITORY:$CONTAINER_NAME_TAG" ("nm:nm").
# - run: start the container and tag it "$CONTAINER_NAME_NAME" ("nm") # - run: start the container and tag it "$CONTAINER_NAME_NAME" ("nm").
# - exec: run bash inside the container # - exec: run bash inside the container (this is the default).
# - journal|j: print the journal from inside the container # - journal|j: print the journal from inside the container.
# - stop: stop the container # - stop: stop the container.
# - clean: delete the container and the image. # - reset: stop and delete the container.
# - clean: stop and delete the container and the image.
# #
# Options: # Options:
# --no-cleanup: don't delete the CONTAINERFILE and other artifacts # --no-cleanup: don't delete the CONTAINERFILE and other artifacts
@@ -41,7 +42,7 @@ EXEC_ENV=()
usage() { usage() {
cat <<EOF cat <<EOF
$0: build|run|exec|stop|clean|journal [--no-cleanup] [--stop] [-- EXTRA_ARGS] $0: build|run|exec|stop|reset|clean|journal [--no-cleanup] [--stop] [-- EXTRA_ARGS]
EOF EOF
echo echo
awk '/^####*$/{ if(on) exit; on=1} { if (on) { if (on==2) print(substr($0,3)); on=2; } }' "$BASH_SOURCE" awk '/^####*$/{ if(on) exit; on=1} { if (on) { if (on==2) print(substr($0,3)); on=2; } }' "$BASH_SOURCE"
@@ -418,9 +419,13 @@ container_is_running() {
############################################################################### ###############################################################################
do_clean() { do_reset() {
podman stop "$CONTAINER_NAME_NAME" || : podman stop "$CONTAINER_NAME_NAME" || :
podman rm "$CONTAINER_NAME_NAME" || : podman rm "$CONTAINER_NAME_NAME" || :
}
do_clean() {
do_reset
podman rmi "$CONTAINER_NAME_REPOSITORY:$CONTAINER_NAME_TAG" || : podman rmi "$CONTAINER_NAME_REPOSITORY:$CONTAINER_NAME_TAG" || :
} }
@@ -509,7 +514,7 @@ for (( i=1 ; i<="$#" ; )) ; do
j) j)
CMD=journal CMD=journal
;; ;;
build|run|exec|stop|clean|journal) build|run|exec|stop|reset|clean|journal)
CMD=$c CMD=$c
;; ;;
--) --)