X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=solution%2Fnetwork%2Fdocker-compose.yml;h=25ff1b0ac9445f5d387865ee33f62153cc27d26e;hb=a289a48ee7b462456d1b27606e6ab576f94ea929;hp=6a29fa3e4e9ff206d34f14c5601c28444927136e;hpb=e7d099ed2bdafd337c53a72fceecbd13ecac7a9a;p=oam.git

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