Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

daniel gerrit-no-reply at lists.osmocom.org
Wed Jun 19 12:56:54 UTC 2019


daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/14527 )

Change subject: regen_doc.sh: Add optional parameter to customize docker execution
......................................................................

regen_doc.sh: Add optional parameter to customize docker execution

The osmo-nitb-master image can run not only osmo-nitb, but also
osmo-bsc_nat. In that case we can't use the default command from
Dockerfile, but should provide our own. This argument makes it possible
to do so.

Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Related: OS#1700
---
M scripts/regen_doc.sh
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  daniel: Verified
  pespin: Looks good to me, approved



diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh
index 7c7529f..5327ae8 100755
--- a/scripts/regen_doc.sh
+++ b/scripts/regen_doc.sh
@@ -6,6 +6,7 @@
 PORT="$2"
 COUNTERFILE="$3"
 VTYFILE="$4"
+DOCKER_EXTRA="$5"
 
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 if [ -z "$OSMO_INTERACT_VTY" ]; then
@@ -23,7 +24,8 @@
 
 	docker run --rm --network ${NET_NAME} --ip ${IP_ADDR} \
 		--name ${BUILD_TAG}-${CONTAINERNAME} -d \
-		${REPO_USER}/${CONTAINERNAME}
+		${REPO_USER}/${CONTAINERNAME} \
+		${DOCKER_EXTRA}
 
 
 }

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Gerrit-Change-Number: 14527
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190619/7e096e33/attachment.htm>


More information about the gerrit-log mailing list