#5 added -p to enable force pulling

Author: svensp

app/Commands/PushCommand.php

@@ -122,6 +122,7 @@ protected function configure() {
 			->addArgument('environment', InputArgument::REQUIRED)
 			->addArgument('version', InputArgument::REQUIRED)
 			->addOption('image-exists', 'i', InputOption::VALUE_NONE, 'Do not build and push the image to dockerhub')
+            ->addOption('pull', 'p', InputOption::VALUE_NONE, 'Request rancher to force pull the image before upgrading the service')
 		;
 	}
 
@@ -143,6 +144,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$rancher = $this->rancherService;
 		$rancher->setAccount($account)
 			->setOutput($output)
+            ->setPullImages($input->getOption('pull'))
 			->setProcessHelper( $this->getHelper('process'));
 
 		$stackName = $environmentConfig->get('rancher.stack');

app/RancherAccess/RancherService.php

@@ -43,6 +43,11 @@ class RancherService {
 	 */
 	private $cliMode = false;
 
+    /**
+     * @var bool
+     */
+	protected $pullImages = false;
+
 	use ProcessTrait;
 
 
@@ -231,7 +236,6 @@ public function start(string $directory, string $stackName, array $serviceNames
                 '-s',
                 $stackName,
                 '-d',
-                '-p'
             ];
 		else
             $command = [
@@ -244,8 +248,9 @@ public function start(string $directory, string $stackName, array $serviceNames
                 $stackName,
                 'up',
                 '-d',
-                '-p'
             ];
+		if($this->pullImages)
+            $command[] = '-p';
 
 		if($upgrade)
 			$command = array_merge($command, ['--upgrade']);
@@ -488,7 +493,7 @@ public function stop(string $directory, string $stackName) {
 	 * @param string $serviceName
 	 * @param StateMatcher $stateMatcher defaults to SingleStateMatcher('active') - wait until active
 	 * @param Delayer $delayer defaults to FixedSleepDelayer(500000) - wait for half a second
-	 * @return string
+	 * @return array
 	 */
 	public function wait(string $stackName, string $serviceName, StateMatcher $stateMatcher = null, Delayer $delayer = null) {
 		if($stateMatcher === null)
@@ -604,4 +609,14 @@ public function setCliMode( bool $cliMode ) {
     public function assertStackExists($stackName) {
         $this->getStackIdByName($stackName);
     }
+
+    /**
+     * @param bool $pullImages
+     * @return RancherService
+     */
+    public function setPullImages(bool $pullImages): RancherService
+    {
+        $this->pullImages = $pullImages;
+        return $this;
+    }
 }

composer.json

@@ -23,7 +23,8 @@
         "symfony/yaml": "^3.1",
         "pimple/pimple": "^3.0",
         "symfony/process": "^3.1",
-        "ipunkt/rancherize-php53": "^1.4.0"
+        "ipunkt/rancherize-php53": "^1.4.0",
+      "ext-json": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.6",