make/Makefile: always use docker run --rm

Add --rm to the "docker run" line in make/Makefile, and remove it from
RUN_ARGS.

Related: https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up
Related: SYS#5827
Change-Id: Iea063aa39a08397ea64d2018b433991a130e7f56
This commit is contained in:
Oliver Smith 2022-02-11 15:24:28 +01:00 committed by osmith
parent 45a2b5d817
commit a0a991f412
47 changed files with 49 additions and 48 deletions

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT
include ../make/Makefile

View File

@ -1,5 +1,5 @@
RUN_ARGS?= \
-it --rm \
-it \
--privileged \
-v /dev/bus/usb:/dev/bus/usb

View File

@ -166,6 +166,7 @@ minor-release: tag-minor-release release
major-release: tag-major-release release
@echo $(VERSION)
# Always use --rm, so we don't waste disk space
# https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up
run:
docker run $(RUN_ARGS) $(IMAGE) $(RUN_CMD)
docker run --rm $(RUN_ARGS) $(IMAGE) $(RUN_CMD)

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.7.2
RUN_ARGS?=-it --network sigtran --ip 172.18.7.2
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.6.3
RUN_ARGS?=-it --network sigtran --ip 172.18.6.3
include ../make/Makefile

View File

@ -1,5 +1,5 @@
DATA_DIR?=$(shell pwd)
USER_ID?=$(shell id -u)
RUN_ARGS=-it --rm -v $(DATA_DIR):/data --user $(USER_ID) --network host
RUN_ARGS=-it -v $(DATA_DIR):/data --user $(USER_ID) --network host
include ../make/Makefile

View File

@ -1,5 +1,5 @@
RUN_ARGS?= \
-it --rm \
-it \
--privileged \
-v /dev/bus/usb:/dev/bus/usb

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.210 -v bts-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
include ../make/Makefile

View File

@ -1,5 +1,5 @@
RUN_ARGS?= \
-it --rm \
-it \
--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
--sysctl net.ipv6.conf.all.disable_ipv6=0 \
--sysctl net.ipv6.conf.all.forwarding=1 \

View File

@ -1,5 +1,5 @@
RUN_ARGS?= \
-it --rm \
-it \
--cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \
--sysctl net.ipv6.conf.all.disable_ipv6=0 \
--sysctl net.ipv6.conf.all.forwarding=1 \

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data
RUN_ARGS?=-it --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.10 -v msc-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.180 -v mgw-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.10 -v msc-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.20 -v nitb-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.211 -v pcu-vol:/data
include ../make/Makefile

View File

@ -1,2 +1,2 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
include ../make/Makefile

View File

@ -1,2 +1,2 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
include ../../../make/Makefile

View File

@ -1,2 +1,2 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.201 -v bsc-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.201 -v bsc-vol:/data
include ../../../make/Makefile

View File

@ -1,2 +1,2 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
include ../../../make/Makefile

View File

@ -1,2 +1,2 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data
include ../../../make/Makefile

View File

@ -1,3 +1,3 @@
#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
#RUN_ARGS?=-it --network sigtran --ip 172.18.0.210 -v bts-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data
#RUN_ARGS?=-it --network sigtran --ip 172.18.0.210 -v bts-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.20 -v bsc-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.18.0.200 -v stp-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm
RUN_ARGS?=-it
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.3
RUN_ARGS?=-it --network sigtran --ip 172.18.0.3
include ../make/Makefile

View File

@ -1,2 +1,2 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
include ../make/Makefile

View File

@ -19,7 +19,7 @@ cfg: $(CFG_SRC_FILES) $(CFG_GEN_FILES)
# See https://www.gnu.org/software/make/manual/make.html#Force-Targets
%src.cfg: FORCE_FETCH
$(MAKE) run \
RUN_ARGS="-v $(CURDIR):/data --user $(UID) --rm" \
RUN_ARGS="-v $(CURDIR):/data --user $(UID)" \
RUN_CMD="cp /osmo-ttcn3-hacks/bts/$(@:%.src.cfg=%.cfg) /data/$@"
FORCE_FETCH:

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data
RUN_ARGS?=-it --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202
include ../make/Makefile

View File

@ -1,3 +1,3 @@
RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data
include ../make/Makefile