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 <[email protected]>
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
