Browse Source

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
changes/58/27158/2
Oliver Smith 6 months ago committed by osmith
parent
commit
a0a991f412
  1. 2
      alpine-lighttpd/Makefile
  2. 2
      gr-gsm-master/Makefile
  3. 5
      make/Makefile
  4. 2
      nplab-m3ua-test/Makefile
  5. 2
      nplab-sua-test/Makefile
  6. 2
      open5gs-latest/Makefile
  7. 2
      openbts-umts/Makefile
  8. 2
      osmo-bsc-master/Makefile
  9. 2
      osmo-bts-master/Makefile
  10. 2
      osmo-gbproxy-latest/Makefile
  11. 2
      osmo-gbproxy-master/Makefile
  12. 2
      osmo-ggsn-latest/Makefile
  13. 2
      osmo-ggsn-master/Makefile
  14. 2
      osmo-gsm-tester/Makefile
  15. 2
      osmo-hlr-master/Makefile
  16. 2
      osmo-hnbgw-master/Makefile
  17. 2
      osmo-hnodeb-master/Makefile
  18. 2
      osmo-mgw-master/Makefile
  19. 2
      osmo-msc-master/Makefile
  20. 2
      osmo-nitb-master/Makefile
  21. 2
      osmo-pcu-master/Makefile
  22. 2
      osmo-ran/Makefile
  23. 2
      osmo-ran/split/ran-bsc_mgw/Makefile
  24. 2
      osmo-ran/split/ran-bts_pcu/Makefile
  25. 2
      osmo-ran/split/ran-trx-ipc/Makefile
  26. 2
      osmo-ran/split/ran-trx-uhd/Makefile
  27. 2
      osmo-remsim-latest/Makefile
  28. 2
      osmo-remsim-master/Makefile
  29. 2
      osmo-sgsn-master/Makefile
  30. 2
      osmo-smlc-master/Makefile
  31. 2
      osmo-stp-master/Makefile
  32. 2
      sctp-test/Makefile
  33. 2
      sigtran-tests/Makefile
  34. 2
      systemd/Makefile
  35. 2
      ttcn3-bsc-test-vamos/Makefile
  36. 2
      ttcn3-bsc-test/Makefile
  37. 2
      ttcn3-bts-test/Makefile
  38. 2
      ttcn3-cbc-test/Makefile
  39. 2
      ttcn3-hnodeb-test/Makefile
  40. 2
      ttcn3-msc-test/Makefile
  41. 2
      ttcn3-nitb-sysinfo/Makefile
  42. 2
      ttcn3-pcap-client-test/Makefile
  43. 2
      ttcn3-pcu-test/Makefile
  44. 2
      ttcn3-sccp-test/Makefile
  45. 2
      ttcn3-sgsn-test/Makefile
  46. 2
      ttcn3-smlc-test/Makefile
  47. 2
      ttcn3-stp-test/Makefile

2
alpine-lighttpd/Makefile

@ -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

2
gr-gsm-master/Makefile

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

5
make/Makefile

@ -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)

2
nplab-m3ua-test/Makefile

@ -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

2
nplab-sua-test/Makefile

@ -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

2
open5gs-latest/Makefile

@ -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

2
openbts-umts/Makefile

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

2
osmo-bsc-master/Makefile

@ -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

2
osmo-bts-master/Makefile

@ -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

2
osmo-gbproxy-latest/Makefile

@ -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

2
osmo-gbproxy-master/Makefile

@ -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

2
osmo-ggsn-latest/Makefile

@ -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 \

2
osmo-ggsn-master/Makefile

@ -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 \

2
osmo-gsm-tester/Makefile

@ -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

2
osmo-hlr-master/Makefile

@ -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

2
osmo-hnbgw-master/Makefile

@ -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

2
osmo-hnodeb-master/Makefile

@ -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

2
osmo-mgw-master/Makefile

@ -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

2
osmo-msc-master/Makefile

@ -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

2
osmo-nitb-master/Makefile

@ -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

2
osmo-pcu-master/Makefile

@ -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

2
osmo-ran/Makefile

@ -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

2
osmo-ran/split/ran-bsc_mgw/Makefile

@ -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

2
osmo-ran/split/ran-bts_pcu/Makefile

@ -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

2
osmo-ran/split/ran-trx-ipc/Makefile

@ -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

2
osmo-ran/split/ran-trx-uhd/Makefile

@ -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

2
osmo-remsim-latest/Makefile

@ -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

2
osmo-remsim-master/Makefile

@ -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

2
osmo-sgsn-master/Makefile

@ -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

2
osmo-smlc-master/Makefile

@ -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

2
osmo-stp-master/Makefile

@ -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

2
sctp-test/Makefile

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

2
sigtran-tests/Makefile

@ -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

2
systemd/Makefile

@ -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

2
ttcn3-bsc-test-vamos/Makefile

@ -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

2
ttcn3-bsc-test/Makefile

@ -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

2
ttcn3-bts-test/Makefile

@ -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:

2
ttcn3-cbc-test/Makefile

@ -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

2
ttcn3-hnodeb-test/Makefile

@ -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

2
ttcn3-msc-test/Makefile

@ -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

2
ttcn3-nitb-sysinfo/Makefile

@ -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

2
ttcn3-pcap-client-test/Makefile

@ -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

2
ttcn3-pcu-test/Makefile

@ -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

2
ttcn3-sccp-test/Makefile

@ -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

2
ttcn3-sgsn-test/Makefile

@ -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

2
ttcn3-smlc-test/Makefile

@ -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

2
ttcn3-stp-test/Makefile

@ -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

Loading…
Cancel
Save