Merge branch 'kirtangajjar-add-labelschema-notations' into develop

Author: mbtamuli

features/bootstrap/FeatureContext.php

@@ -336,6 +336,22 @@ public function cleanupScenario(AfterScenarioScope $scope)
 		chdir($this->ee_path);
 	}
 
+	/**
+	 * @Then There should be :expected_running_containers containers with labels
+	 */
+	public function thereShouldBeContainersWithLabel($expected_running_containers, PyStringNode $pyStringNode)
+	{
+		$labels = $pyStringNode->getStrings();
+		$label_string = implode($labels, ' -f label=');
+
+		$result = EE::launch( "docker ps -aqf label=$label_string | wc -l", false, true );
+		$running_containers = (int) trim($result->stdout);
+
+		if($expected_running_containers === $running_containers) {
+			throw new Exception("Expected $expected_running_containers running containers. Found: $running_containers");
+		}
+	}
+
 	/**
 	 * @AfterFeature
 	 */
@@ -349,6 +365,7 @@ public static function cleanup(AfterFeatureScope $scope)
 			'www.example1.test',
 			'example2.test',
 			'www.example3.test',
+			'labels.test'
 		];
 
 		$result = EE::launch( 'sudo bin/ee site list --format=text',false, true );

features/labels.feature

@@ -0,0 +1,9 @@
+Feature: Container Labels
+
+
+  Scenario: All easyengine containers are tagged
+    Given I run "bin/ee site create labels.test"
+    Then There should be 5 containers with labels
+    """
+    io.easyengine.site=labels.test
+    """

src/Site_Docker.php

@@ -23,6 +23,13 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		$db['service_name'] = array( 'name' => 'db' );
 		$db['image']        = array( 'name' => 'easyengine/mariadb:v' . EE_VERSION );
 		$db['restart']      = $restart_default;
+		$db['labels']      = array(
+			array(
+				'label' => array(
+					'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+				),
+			),
+		);
 		$db['volumes']      = array(
 			array(
 				'vol' => array(
@@ -44,6 +51,13 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		$php['image']        = array( 'name' => 'easyengine/php:v' . EE_VERSION );
 		$php['depends_on']   = array( 'name' => 'db' );
 		$php['restart']      = $restart_default;
+		$php['labels']      = array(
+			array(
+				'label' => array(
+					'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+				),
+			),
+		);
 		$php['volumes']      = array(
 			array(
 				'vol' => array(
@@ -88,6 +102,13 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 				array( 'name' => './config/nginx/common:/usr/local/openresty/nginx/conf/common' ),
 			),
 		);
+		$nginx['labels']      = array(
+			array(
+				'label' => array(
+					'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+				),
+			),
+		);
 		$nginx['networks']    = $network_default;
 
 		// PhpMyAdmin configuration.
@@ -101,6 +122,13 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 				array( 'name' => 'VIRTUAL_PATH=/ee-admin/pma/' ),
 			),
 		);
+		$phpmyadmin['labels']      = array(
+			array(
+				'label' => array(
+					'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+				),
+			),
+		);
 		$phpmyadmin['networks']     = $network_default;
 
 		// mailhog configuration.
@@ -115,11 +143,25 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 				array( 'name' => 'VIRTUAL_PORT=8025' ),
 			),
 		);
+		$mailhog['labels']      = array(
+			array(
+				'label' => array(
+					'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+				),
+			),
+		);
 		$mailhog['networks']     = $network_default;
 
 		// redis configuration.
 		$redis['service_name'] = array( 'name' => 'redis' );
 		$redis['image']        = array( 'name' => 'easyengine/redis:v' . EE_VERSION );
+		$redis['labels']      = array(
+			array(
+				'label' => array(
+					'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+				),
+			),
+		);
 		$redis['networks']     = $network_default;
 
 		if ( in_array( 'db', $filters, true ) ) {