Skip to content

Commit

Permalink
empty space removed
Browse files Browse the repository at this point in the history
  • Loading branch information
Arvind committed Mar 13, 2020
1 parent 5dcbb46 commit c416532
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/Compose/DeveloperBuilder.php
Expand Up @@ -57,7 +57,6 @@ class DeveloperBuilder implements BuilderInterface
*/
private $extensionResolver;


/**
* @param BuilderFactory $builderFactory
* @param FileList $fileList
Expand Down
14 changes: 6 additions & 8 deletions src/Compose/ProductionBuilder.php
Expand Up @@ -107,7 +107,6 @@ class ProductionBuilder implements BuilderInterface
* @param Resolver $resolver
* @param VolumeResolver $volumeResolver
*/

public function __construct(
ServiceFactory $serviceFactory,
FileList $fileList,
Expand All @@ -125,6 +124,7 @@ public function __construct(
$this->resolver = $resolver;
$this->volumeResolver = $volumeResolver;
}

/**
* {@inheritdoc}
*
Expand All @@ -144,8 +144,6 @@ public function build(Config $config): Manager
$manager->addNetwork(self::NETWORK_MAGENTO, ['driver' => 'bridge']);
$manager->addNetwork(self::NETWORK_MAGENTO_BUILD, ['driver' => 'bridge']);

$volumePrefix = $config->getName() . '-';

$volumes = [
self::VOLUME_MAGENTO => [
'driver_opts' => [
Expand All @@ -154,8 +152,8 @@ public function build(Config $config): Manager
'o' => 'bind'
]
],
$volumePrefix . self::VOLUME_MAGENTO_DB => [],
$volumePrefix . self::VOLUME_MARIADB_CONF => [
self::VOLUME_MAGENTO_DB => [],
self::VOLUME_MARIADB_CONF => [
'driver_opts' => [
'type' => 'none',
'device' => $this->resolver->getRootPath('/.docker/mysql/mariadb.conf.d'),
Expand Down Expand Up @@ -242,9 +240,9 @@ public function build(Config $config): Manager
'ports' => [$dbPorts],
'volumes' => array_merge(
[
$volumePrefix . self::VOLUME_MAGENTO_DB . ':/var/lib/mysql',
self::VOLUME_MAGENTO_DB . ':/var/lib/mysql',
self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d',
$volumePrefix . self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d',
self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d',
],
$volumesMount
)
Expand Down Expand Up @@ -470,4 +468,4 @@ public function getPath(): string
{
return $this->fileList->getMagentoDockerCompose();
}
}
}

0 comments on commit c416532

Please sign in to comment.