set mantle service on php command if network service shares network

ipunkt · Aug 27, 2019 · ead2906 · ead2906
1 parent 3e57e63
commit ead2906
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/Blueprint/Infrastructure/Service/Service.php b/app/Blueprint/Infrastructure/Service/Service.php
@@ -372,7 +372,6 @@ public function setKeepStdin(bool $keepStdin) {
 	 */
 	public function getLinks(): array {
 	    if($this->isMantled()) {
-	        echo $this->getName().' has mantled links!'.PHP_EOL;
             return [];
         }
 
@@ -635,9 +634,6 @@ public function setAlwaysPulled( $alwaysPulled ) {
      */
     public function getCopyVolumesFrom(): array
     {
-        if($this->mantleService instanceof Service) {
-        }
-
         return $this->copyVolumesFrom;
     }
 

diff --git a/app/Blueprint/PhpCommands/EventHandler/PhpCommandsEventHandler.php b/app/Blueprint/PhpCommands/EventHandler/PhpCommandsEventHandler.php
@@ -89,8 +89,10 @@ public function mainServiceBuilt( MainServiceBuiltEvent $event ) {
 			];
 
 			$isSidekick = !$command->isService();
-			if( $isSidekick && $command->isNetworkShared() )
-			    $service->setNetworkMode(new ShareNetworkMode($mainService));
+			if( $isSidekick && $command->isNetworkShared() ) {
+			    $service->setMantleService($mainService);
+                $service->setNetworkMode(new ShareNetworkMode($mainService));
+            }
 
 			if ( array_key_exists( $command->getRestart(), $restart ) )
 				$service->setRestart( $restart[$command->getRestart()] );