php-commands: added share-network option

ipunkt · Aug 22, 2019 · bd496de · bd496de
1 parent 7e8dfa8
commit bd496de
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/app/Blueprint/PhpCommands/EventHandler/PhpCommandsEventHandler.php b/app/Blueprint/PhpCommands/EventHandler/PhpCommandsEventHandler.php
@@ -1,12 +1,12 @@
 <?php namespace Rancherize\Blueprint\PhpCommands\EventHandler;
 
 use Rancherize\Blueprint\Cron\CronService\CronService;
-use Rancherize\Blueprint\Cron\Schedule\Exceptions\NoScheduleConfiguredException;
 use Rancherize\Blueprint\Cron\Schedule\ScheduleParser;
 use Rancherize\Blueprint\Events\MainServiceBuiltEvent;
 use Rancherize\Blueprint\Events\ServiceBuiltEvent;
 use Rancherize\Blueprint\Events\SidekickBuiltEvent;
 use Rancherize\Blueprint\Infrastructure\Service\Maker\PhpFpm\PhpFpmMaker;
+use Rancherize\Blueprint\Infrastructure\Service\NetworkMode\ShareNetworkMode;
 use Rancherize\Blueprint\Infrastructure\Service\Service;
 use Rancherize\Blueprint\Keepalive\KeepaliveService;
 use Rancherize\Blueprint\PhpCommands\Parser\PhpCommandsParser;
@@ -88,6 +88,10 @@ public function mainServiceBuilt( MainServiceBuiltEvent $event ) {
 				'start-once' => Service::RESTART_START_ONCE,
 			];
 
+			$isSidekick = !$command->isService();
+			if( $isSidekick && $command->isNetworkShared() )
+			    $service->setNetworkMode(new ShareNetworkMode($mainService));
+
 			if ( array_key_exists( $command->getRestart(), $restart ) )
 				$service->setRestart( $restart[$command->getRestart()] );
 

diff --git a/app/Blueprint/PhpCommands/Parser/ArrayParser.php b/app/Blueprint/PhpCommands/Parser/ArrayParser.php
@@ -29,10 +29,14 @@ public function parse( string $name, $data, $version ) {
 		if(array_key_exists('is-service', $data) && is_bool($data['is-service']) )
 			$isService = $data['is-service'];
 
+
 		$command = $data['command'];
 
 		$phpCommand = new PhpCommand( $commandName, $command, $isService );
 
+        if(array_key_exists('share-network', $data) && is_bool($data['share-network']) )
+            $phpCommand->setNetworkShared($data['share-network']);
+
 		if ( array_key_exists( 'restart', $data ) )
 			$phpCommand->setRestart( $data['restart'] );
 

diff --git a/app/Blueprint/PhpCommands/PhpCommand.php b/app/Blueprint/PhpCommands/PhpCommand.php
@@ -39,6 +39,11 @@ class PhpCommand {
 	 */
 	protected $configuration;
 
+    /**
+     * @var bool
+     */
+	protected $networkShared = false;
+
 	/**
 	 * PhpCommand constructor.
 	 * @param string $name
@@ -133,4 +138,22 @@ public function hasKeepaliveService(): bool
         return $this->keepaliveService;
     }
 
+    /**
+     * @param bool $networkShared
+     * @return PhpCommand
+     */
+    public function setNetworkShared(bool $networkShared): PhpCommand
+    {
+        $this->networkShared = $networkShared;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isNetworkShared(): bool
+    {
+        return $this->networkShared;
+    }
+
 }
diff --git a/app/Blueprint/PhpCommands/README.md b/app/Blueprint/PhpCommands/README.md
@@ -42,6 +42,7 @@ Use for commands that need to be run periodically
 }
 ```
 
+- `share-network` share the network of the main container. Only available when running as sidekick
 - `keepalive` adds a dummy container which does nothing but stays active. The commands then join the network of this active container.  
   This helps with problems with the rancher dns service taking a few seconds after the container start to work. It also
   improves reliability of sidekick services joining the network of your container because they don't have to restart with your original command.