From dd52b07bc75477f82f6208fc5d8b2088af3dc18f Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Wed, 5 Apr 2023 17:25:19 +0200 Subject: [PATCH] Automate injection of 3GPP yaml files - change in docker-compose related to latest docker compose version Issue-ID: OAM-324 Change-Id: Ieaf9fa54fe3a04d96bbf3bf8340f43b17ce105d1 Signed-off-by: Martin Skorupski --- solution/network/docker-compose.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/solution/network/docker-compose.yml b/solution/network/docker-compose.yml index 6a29fa3..25ff1b0 100755 --- a/solution/network/docker-compose.yml +++ b/solution/network/docker-compose.yml @@ -75,8 +75,7 @@ services: - ./ntsim-ng-o-du/o-ran-sc-du-hello-world-running.xml:/opt/dev/deploy/data/o-ran-sc-du-hello-world-running.xml - ./ntsim-ng-o-du/o-ran-sc-du-hello-world-operational.xml:/opt/dev/deploy/data/o-ran-sc-du-hello-world-operational.xml environment: - <<: *common_env - <<: *du_env + <<: [*common_env, *du_env] ntsim-ng-o-ru-fh-11221: <<: *common_nf @@ -90,8 +89,7 @@ services: - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-1/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-1/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml environment: - <<: *common_env - <<: *ru_env + <<: [*common_env, *ru_env] ntsim-ng-o-ru-fh-11222: <<: *common_nf @@ -105,8 +103,7 @@ services: - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-2/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-2/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml environment: - <<: *common_env - <<: *ru_env + <<: [*common_env, *ru_env] ntsim-ng-o-ru-fh-11223: <<: *common_nf @@ -120,10 +117,10 @@ services: - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-3/ietf-interfaces-operational.xml:/opt/dev/deploy/data/ietf-interfaces-operational.xml - ./ntsim-ng-o-ru/ntsim-ng-o-ru-fh-3/ietf-interfaces-running.xml:/opt/dev/deploy/data/ietf-interfaces-running.xml environment: - <<: *common_env - <<: *ru_env + <<: [*common_env, *ru_env] networks: default: - external: - name: oam + name: oam + external: true + \ No newline at end of file -- 2.16.6