Merge pull request #1 from justb81/master

master

Author: justb81

composer.json

@@ -16,7 +16,8 @@
     }
   },
   "require": {
-    "ipunkt/rancherize": "^2.11.1"
+    "php": "^7.0",
+    "ipunkt/rancherize": "^2.11.3"
   },
 
   "extra":{

composer.lock

@@ -4,11 +4,15 @@
 use Rancherize\Blueprint\Flags\HasFlagsTrait;
 use Rancherize\Blueprint\Infrastructure\Dockerfile\Dockerfile;
 use Rancherize\Blueprint\Infrastructure\Infrastructure;
+use Rancherize\Blueprint\Scheduler\SchedulerInitializer\SchedulerInitializer;
 use Rancherize\Blueprint\Validation\Exceptions\ValidationFailedException;
+use Rancherize\Blueprint\Validation\Traits\HasValidatorTrait;
 use Rancherize\Configuration\Configurable;
 use Rancherize\Configuration\Configuration;
 use Rancherize\Configuration\PrefixConfigurableDecorator;
+use Rancherize\Configuration\PrefixConfigurationDecorator;
 use Rancherize\Configuration\Services\ConfigurableFallback;
+use Rancherize\Configuration\Services\ConfigurationFallback;
 use Rancherize\Configuration\Services\ConfigurationInitializer;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -24,6 +28,8 @@ class PhpCliBlueprint implements Blueprint {
 	 */
 	use HasFlagsTrait;
 
+    use HasValidatorTrait;
+
 	/**
 	 * Fill the configurable with all possible options with explanatory default options set
 	 *
@@ -68,21 +74,43 @@ public function init( Configurable $configurable, string $environment, InputInte
 		 */
 		$initializer = new ConfigurationInitializer($output);
 
+
+
 		/**
 		 *
 		 */
 		if( $this->getFlag('dev', false) ) {
 			/**
 			 * Provide defaults for local development environment
 			 */
-
-			return;
-		}
-
-		/**
-		 * Provide defaults for rancher environments
-		 */
-	}
+            $initializer->init($fallbackConfigurable, 'mount-workdir', true);
+		} else {
+            $initializer->init($fallbackConfigurable, 'rancher.stack', 'Project');
+
+            $schedulerInitializer = new SchedulerInitializer($initializer);
+            $schedulerInitializer->init($fallbackConfigurable, $projectConfigurable);
+        }
+
+        /**
+         * Provide defaults for rancher environments
+         */
+        $initializer->init($fallbackConfigurable, 'external_links', []);
+
+        $initializer->init($fallbackConfigurable, 'docker.repository', 'repo/name', $projectConfigurable);
+        $initializer->init($fallbackConfigurable, 'docker.version-prefix', '', $projectConfigurable);
+        $initializer->init($fallbackConfigurable, 'service-name', 'Project', $projectConfigurable);
+        $initializer->init($fallbackConfigurable, 'docker.base-image', 'php:7.0-alpine', $projectConfigurable);
+        $initializer->init($fallbackConfigurable, 'environment', ["EXAMPLE" => 'value']);
+
+        /**
+         * Blueprint specific entries
+         */
+        $initializer->init($fallbackConfigurable, 'php', '7.0', $projectConfigurable);
+//        $initializer->init($fallbackConfigurable, 'extensions', []);
+        $initializer->init($fallbackConfigurable, 'add-composer', false, $projectConfigurable);
+        $initializer->init($fallbackConfigurable, 'command', "-i", $projectConfigurable);
+
+    }
 
 	/**
 	 * Ensure that the given environment has at least the minimal configuration options set to start and deploy this
@@ -93,12 +121,14 @@ public function init( Configurable $configurable, string $environment, InputInte
 	 * @throws ValidationFailedException
 	 */
 	public function validate( Configuration $configurable, string $environment ) {
-		// TODO: Implement validate() method.
 
-		/**
-		 * Validation config.
-		 * Throw ValidationFailedExceptions to indicate errors
-		 */
+        $projectConfigurable = new PrefixConfigurationDecorator($configurable, "project.default.");
+        $environmentConfigurable = new PrefixConfigurationDecorator($configurable, "project.environments.$environment.");
+        $config = new ConfigurationFallback($environmentConfigurable, $projectConfigurable);
+
+        $this->getValidator()->validate($config, [
+            'service-name' => 'required',
+        ]);
 	}
 
 	/**
@@ -110,11 +140,63 @@ public function validate( Configuration $configurable, string $environment ) {
 	public function build( Configuration $configuration, string $environment, string $version = null ): Infrastructure {
 		$infrastructure = new Infrastructure();
 
-		$dockerfile = new Dockerfile();
+        $projectConfigurable = new PrefixConfigurationDecorator($configuration, "project.default.");
+        $environmentConfigurable = new PrefixConfigurationDecorator($configuration, "project.environments.$environment.");
+        $config = new ConfigurationFallback($environmentConfigurable, $projectConfigurable);
+
+		$dockerfile = $this->makeDockerfile($config);
 		$infrastructure->setDockerfile($dockerfile);
 
 		// TODO: Implement build() method.
 
 		return $infrastructure;
 	}
+
+    /**
+     * @param $config
+     * @return Dockerfile
+     */
+    protected function makeDockerfile(Configuration $config):Dockerfile {
+        $dockerfile = new Dockerfile();
+
+        $baseimage = $config->has('php')
+                ? 'php:' . $config->get('php', '7.0') . '-alpine'
+                : $config->get('docker.base-image', 'php:7.0-alpine');
+        $dockerfile->setFrom($baseimage);
+
+        $dockerfile->addVolume('/var/www/app');
+
+        $dockerfile->setWorkdir('/var/www/app');
+
+        $copySuffix = $config->get('work-sub-directory', '');
+        $targetSuffix = $config->get('target-sub-directory', '');
+        $dockerfile->copy('.'.$copySuffix, '/var/www/app'.$targetSuffix);
+
+        if ($config->get('add-composer', false)) {
+            $dockerfile->run('php -r "copy(\'https://getcomposer.org/installer\', \'composer-setup.php\');" \
+	&& php -r "if (hash_file(\'SHA384\', \'composer-setup.php\') === \'669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410\') { echo \'Installer verified\'; } else { echo \'Installer corrupt\'; unlink(\'composer-setup.php\'); } echo PHP_EOL;" \
+	&& php composer-setup.php \
+	php -r "unlink(\'composer-setup.php\');" \
+	&& cd /var/www/app && ./composer.phar install && rm composer.phar');
+        }
+
+        $additionalFiles = $config->get('add-files');
+        if( is_array($additionalFiles) ) {
+            foreach($additionalFiles as $file => $path) {
+                $dockerfile->copy($file, $path);
+            }
+        }
+        $additionalVolumes = $config->get('add-volumes');
+        if( is_array($additionalVolumes) ) {
+            foreach($additionalFiles as $path) {
+                $dockerfile->addVolume($path);
+            }
+        }
+        $dockerfile->run('rm -Rf /var/www/app/.rancherize');
+
+        $dockerfile->setCommand('php '.$config->get('command', '-i'));
+
+        return $dockerfile;
+    }
+
 }

plugin/PhpCliBlueprint/PhpCliBlueprint.php

@@ -16,7 +16,6 @@ class RancherBlueprintPhpCliProvider implements Provider {
 	/**
 	 */
 	public function register() {
-		// TODO: Implement register() method.
 	}
 
 	/**