From baad6d19b6757e3eb6d2ef5322210068dc31cc3c Mon Sep 17 00:00:00 2001 From: Ulrik Stridsman Date: Wed, 7 Dec 2022 22:37:54 +0100 Subject: [PATCH] Mount NSO containers pid namespace for dev-shells. --- skeletons/ned/testenvs/testenv-common.mk | 2 +- skeletons/package/testenvs/testenv-common.mk | 2 +- skeletons/system/testenvs/testenv-common.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skeletons/ned/testenvs/testenv-common.mk b/skeletons/ned/testenvs/testenv-common.mk index 9975aea..6818469 100644 --- a/skeletons/ned/testenvs/testenv-common.mk +++ b/skeletons/ned/testenvs/testenv-common.mk @@ -199,7 +199,7 @@ check-logs: # and network namespace of the testenv NSO container. This allows running # python script and IPython that interface with NSO. dev-shell: - docker run -it --rm -v $(PROJECT_DIR):/src --volumes-from $(CNT_PREFIX)-nso$(NSO) --network container:$(CNT_PREFIX)-nso$(NSO) $(NSO_IMAGE_PATH)cisco-nso-dev:$(NSO_VERSION) + docker run -it --rm -v $(PROJECT_DIR):/src --pid container:$(CNT_PREFIX)-nso$(NSO) --volumes-from $(CNT_PREFIX)-nso$(NSO) --network container:$(CNT_PREFIX)-nso$(NSO) $(NSO_IMAGE_PATH)cisco-nso-dev:$(NSO_VERSION) # Wait for all containers in the testenv (as found via the testenv label) to # become healthy! If a container has exited, we exit immediately. diff --git a/skeletons/package/testenvs/testenv-common.mk b/skeletons/package/testenvs/testenv-common.mk index 16741bf..67a274e 100644 --- a/skeletons/package/testenvs/testenv-common.mk +++ b/skeletons/package/testenvs/testenv-common.mk @@ -199,7 +199,7 @@ check-logs: # and network namespace of the testenv NSO container. This allows running # python script and IPython that interface with NSO. dev-shell: - docker run -it --rm -v $(PROJECT_DIR):/src --volumes-from $(CNT_PREFIX)-nso$(NSO) --network container:$(CNT_PREFIX)-nso$(NSO) $(NSO_IMAGE_PATH)cisco-nso-dev:$(NSO_VERSION) + docker run -it --rm -v $(PROJECT_DIR):/src --pid container:$(CNT_PREFIX)-nso$(NSO) --volumes-from $(CNT_PREFIX)-nso$(NSO) --network container:$(CNT_PREFIX)-nso$(NSO) $(NSO_IMAGE_PATH)cisco-nso-dev:$(NSO_VERSION) # Wait for all containers in the testenv (as found via the testenv label) to # become healthy! If a container has exited, we exit immediately. diff --git a/skeletons/system/testenvs/testenv-common.mk b/skeletons/system/testenvs/testenv-common.mk index 9975aea..6818469 100644 --- a/skeletons/system/testenvs/testenv-common.mk +++ b/skeletons/system/testenvs/testenv-common.mk @@ -199,7 +199,7 @@ check-logs: # and network namespace of the testenv NSO container. This allows running # python script and IPython that interface with NSO. dev-shell: - docker run -it --rm -v $(PROJECT_DIR):/src --volumes-from $(CNT_PREFIX)-nso$(NSO) --network container:$(CNT_PREFIX)-nso$(NSO) $(NSO_IMAGE_PATH)cisco-nso-dev:$(NSO_VERSION) + docker run -it --rm -v $(PROJECT_DIR):/src --pid container:$(CNT_PREFIX)-nso$(NSO) --volumes-from $(CNT_PREFIX)-nso$(NSO) --network container:$(CNT_PREFIX)-nso$(NSO) $(NSO_IMAGE_PATH)cisco-nso-dev:$(NSO_VERSION) # Wait for all containers in the testenv (as found via the testenv label) to # become healthy! If a container has exited, we exit immediately.