Skip to content

Commit 65b49b4

Browse files
shiftedrealityshiftedreality
authored
MCLOUD-6732: Fix issue with app/etc/env.php on build phase and remove named volumes (#276)
1 parent 12306f8 commit 65b49b4

File tree

12 files changed

+115
-288
lines changed

12 files changed

+115
-288
lines changed

‎images/php/7.2-cli/bin/cloud-build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ if [ "$MAGENTO_RUN_MODE" == "production" ]; then
1919

2020
echo "Cleaning generated directory."
2121
rm -rf $MAGENTO_ROOT/generated/*
22+
23+
echo "Removing app/etc/env.php file"
24+
rm -f $MAGENTO_ROOT/app/etc/env.php
2225
fi
2326

2427
echo "Installing dependencies."

‎images/php/7.3-cli/bin/cloud-build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ if [ "$MAGENTO_RUN_MODE" == "production" ]; then
1919

2020
echo "Cleaning generated directory."
2121
rm -rf $MAGENTO_ROOT/generated/*
22+
23+
echo "Removing app/etc/env.php file"
24+
rm -f $MAGENTO_ROOT/app/etc/env.php
2225
fi
2326

2427
echo "Installing dependencies."

‎images/php/7.4-cli/bin/cloud-build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ if [ "$MAGENTO_RUN_MODE" == "production" ]; then
1919

2020
echo "Cleaning generated directory."
2121
rm -rf $MAGENTO_ROOT/generated/*
22+
23+
echo "Removing app/etc/env.php file"
24+
rm -f $MAGENTO_ROOT/app/etc/env.php
2225
fi
2326

2427
echo "Installing dependencies."

‎images/php/cli/bin/cloud-build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ if [ "$MAGENTO_RUN_MODE" == "production" ]; then
1919

2020
echo "Cleaning generated directory."
2121
rm -rf $MAGENTO_ROOT/generated/*
22+
23+
echo "Removing app/etc/env.php file"
24+
rm -f $MAGENTO_ROOT/app/etc/env.php
2225
fi
2326

2427
echo "Installing dependencies."

‎src/Compose/BuilderInterface.php‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,18 @@ interface BuilderInterface
3939
public const NETWORK_MAGENTO = 'magento';
4040
public const NETWORK_MAGENTO_BUILD = 'magento-build';
4141

42-
public const VOLUME_MAGENTO = 'magento';
42+
public const VOLUME_MAGENTO = '.';
43+
public const VOLUME_DOCKER_MNT = '.docker/mnt';
44+
public const VOLUME_MARIADB_CONF = '.docker/mysql/mariadb.conf.d';
4345
public const VOLUME_MAGENTO_VENDOR = 'magento-vendor';
4446
public const VOLUME_MAGENTO_GENERATED = 'magento-generated';
45-
public const VOLUME_MAGENTO_VAR = 'magento-var';
46-
public const VOLUME_MAGENTO_ETC = 'magento-etc';
47-
public const VOLUME_MAGENTO_STATIC = 'magento-static';
48-
public const VOLUME_MAGENTO_MEDIA = 'magento-media';
4947
public const VOLUME_MAGENTO_DB = 'magento-db';
5048
public const VOLUME_MAGENTO_DB_QUOTE = 'magento-db-quote';
5149
public const VOLUME_MAGENTO_DB_SALES = 'magento-db-sales';
52-
public const VOLUME_MAGENTO_DEV = 'magento-dev';
53-
public const VOLUME_DOCKER_MNT = 'docker-mnt';
54-
public const VOLUME_DOCKER_ETRYPOINT = 'docker-entrypoint';
55-
public const VOLUME_DOCKER_ETRYPOINT_QUOTE = 'docker-entrypoint-quote';
56-
public const VOLUME_DOCKER_ETRYPOINT_SALES = 'docker-entrypoint-sales';
57-
public const VOLUME_MARIADB_CONF = 'mariadb-conf';
50+
public const VOLUME_MAGENTO_DEV = './dev';
51+
public const VOLUME_DOCKER_ETRYPOINT = '.docker/mysql/docker-entrypoint-initdb.d';
52+
public const VOLUME_DOCKER_ETRYPOINT_QUOTE = '.docker/mysql-quote/docker-entrypoint-initdb.d';
53+
public const VOLUME_DOCKER_ETRYPOINT_SALES = '.docker/mysql-sales/docker-entrypoint-initdb.d';
5854

5955
public const SYNC_ENGINE_NATIVE = 'native';
6056

‎src/Compose/DeveloperBuilder.php‎

Lines changed: 11 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ class DeveloperBuilder implements BuilderInterface
4242
*/
4343
private $fileList;
4444

45-
/**
46-
* @var Resolver
47-
*/
48-
private $resolver;
49-
5045
/**
5146
* @var Converter
5247
*/
@@ -60,20 +55,17 @@ class DeveloperBuilder implements BuilderInterface
6055
/**
6156
* @param BuilderFactory $builderFactory
6257
* @param FileList $fileList
63-
* @param Resolver $resolver
6458
* @param Converter $converter
6559
* @param ExtensionResolver $extensionResolver
6660
*/
6761
public function __construct(
6862
BuilderFactory $builderFactory,
6963
FileList $fileList,
70-
Resolver $resolver,
7164
Converter $converter,
7265
ExtensionResolver $extensionResolver
7366
) {
7467
$this->builderFactory = $builderFactory;
7568
$this->fileList = $fileList;
76-
$this->resolver = $resolver;
7769
$this->converter = $converter;
7870
$this->extensionResolver = $extensionResolver;
7971
}
@@ -92,45 +84,25 @@ public function build(Config $config): Manager
9284
->build($config);
9385

9486
$syncEngine = $config->getSyncEngine();
95-
$syncConfig = [];
96-
97-
if ($syncEngine === self::SYNC_ENGINE_DOCKER_SYNC) {
98-
$syncConfig = ['external' => true];
99-
} elseif ($syncEngine === self::SYNC_ENGINE_MUTAGEN) {
100-
$syncConfig = [];
101-
} elseif ($syncEngine === self::SYNC_ENGINE_NATIVE) {
102-
$syncConfig = [
103-
'driver_opts' => [
104-
'type' => 'none',
105-
'device' => $this->resolver->getRootPath(),
106-
'o' => 'bind'
107-
]
108-
];
109-
}
110-
11187
$volumesList = [
112-
$volumePrefix . self::VOLUME_MAGENTO_SYNC => $syncConfig,
11388
$volumePrefix . self::VOLUME_MAGENTO_DB => []
11489
];
11590

91+
$volumes = [self::VOLUME_MAGENTO . ':' . self::DIR_MAGENTO . ':delegated'];
92+
93+
if (in_array($syncEngine, [self::SYNC_ENGINE_MUTAGEN, self::SYNC_ENGINE_DOCKER_SYNC], true)) {
94+
$volumesList[$volumePrefix . self::VOLUME_MAGENTO_SYNC] = $syncEngine === self::SYNC_ENGINE_DOCKER_SYNC
95+
? ['external' => true]
96+
: [];
97+
$volumes = [$volumePrefix . self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':nocopy'];
98+
}
99+
116100
if ($config->hasMariaDbConf()) {
117-
$volumesList[$volumePrefix . self::VOLUME_MARIADB_CONF] = [
118-
'driver_opts' => [
119-
'type' => 'none',
120-
'device' => $this->resolver->getRootPath('/.docker/mysql/mariadb.conf.d'),
121-
'o' => 'bind',
122-
],
123-
];
101+
$volumesList[$volumePrefix . self::VOLUME_MARIADB_CONF] = [];
124102
}
125103

126104
if ($config->hasDbEntrypoint()) {
127-
$volumesList[self::VOLUME_DOCKER_ETRYPOINT] = [
128-
'driver_opts' => [
129-
'type' => 'none',
130-
'device' => $this->resolver->getRootPath('/.docker/mysql/docker-entrypoint-initdb.d'),
131-
'o' => 'bind'
132-
]
133-
];
105+
$volumesList[self::VOLUME_DOCKER_ETRYPOINT] = [];
134106
}
135107

136108
$manager->setVolumes($volumesList);
@@ -139,7 +111,6 @@ public function build(Config $config): Manager
139111
* Gather all services except DB with specific volumes.
140112
*/
141113
$services = $manager->getServices();
142-
$volumes = $this->getMagentoVolumes($config);
143114

144115
/**
145116
* @var string $sName
@@ -188,24 +159,4 @@ public function getPath(): string
188159
{
189160
return $this->fileList->getMagentoDockerCompose();
190161
}
191-
192-
/**
193-
* @param Config $config
194-
* @return array
195-
* @throws ConfigurationMismatchException
196-
*/
197-
private function getMagentoVolumes(Config $config): array
198-
{
199-
$volumePrefix = $config->getName() . '-';
200-
201-
if ($config->getSyncEngine() !== self::SYNC_ENGINE_NATIVE) {
202-
return [
203-
$volumePrefix . self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':nocopy'
204-
];
205-
}
206-
207-
return [
208-
$volumePrefix . self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':delegated',
209-
];
210-
}
211162
}

‎src/Compose/ProductionBuilder.php‎

Lines changed: 13 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ class ProductionBuilder implements BuilderInterface
9090
*/
9191
private $managerFactory;
9292

93-
/**
94-
* @var Resolver
95-
*/
96-
private $resolver;
97-
9893
/**
9994
* @var VolumeResolver
10095
*/
@@ -106,7 +101,6 @@ class ProductionBuilder implements BuilderInterface
106101
* @param Converter $converter
107102
* @param ExtensionResolver $phpExtension
108103
* @param ManagerFactory $managerFactory
109-
* @param Resolver $resolver
110104
* @param VolumeResolver $volumeResolver
111105
*/
112106
public function __construct(
@@ -115,15 +109,13 @@ public function __construct(
115109
Converter $converter,
116110
ExtensionResolver $phpExtension,
117111
ManagerFactory $managerFactory,
118-
Resolver $resolver,
119112
VolumeResolver $volumeResolver
120113
) {
121114
$this->serviceFactory = $serviceFactory;
122115
$this->fileList = $fileList;
123116
$this->converter = $converter;
124117
$this->phpExtension = $phpExtension;
125118
$this->managerFactory = $managerFactory;
126-
$this->resolver = $resolver;
127119
$this->volumeResolver = $volumeResolver;
128120
}
129121

@@ -145,68 +137,45 @@ public function build(Config $config): Manager
145137
$manager->addNetwork(self::NETWORK_MAGENTO, ['driver' => 'bridge']);
146138
$manager->addNetwork(self::NETWORK_MAGENTO_BUILD, ['driver' => 'bridge']);
147139

148-
$volumes = [self::VOLUME_MAGENTO => $this->getVolumeConfig()];
149-
150140
$mounts = $config->getMounts();
151141
$hasSelenium = $config->hasSelenium();
152142
$hasTmpMounts = $config->hasTmpMounts();
153143

154144
$hasGenerated = !version_compare($config->getMagentoVersion(), '2.2.0', '<');
145+
$volumes = [];
155146

156-
if ($hasTmpMounts) {
157-
$volumes[self::VOLUME_DOCKER_MNT] = $this->getVolumeConfig('/.docker/mnt');
158-
}
159-
160-
foreach ($this->volumeResolver->getMagentoVolumes(
147+
foreach (array_keys($this->volumeResolver->getMagentoVolumes(
161148
$mounts,
162149
false,
163-
$hasSelenium,
164150
$hasGenerated
165-
) as $volumeName => $volume) {
166-
$syncConfig = [];
167-
168-
if (!empty($volume['volume']) && $config->getSyncEngine() === self::SYNC_ENGINE_NATIVE) {
169-
$syncConfig = $this->getVolumeConfig($volume['volume']);
170-
}
171-
$volumes[$volumeName] = $syncConfig;
172-
}
173-
174-
if ($config->getSyncEngine() === self::SYNC_ENGINE_MOUNT) {
175-
$volumes[self::VOLUME_MAGENTO] = $this->getVolumeConfig();
176-
}
177-
178-
if ($config->hasServiceEnabled(ServiceInterface::SERVICE_SELENIUM)) {
179-
$volumes[self::VOLUME_MAGENTO_DEV] = $this->getVolumeConfig('/dev');
151+
)) as $volumeName) {
152+
$volumes[$volumeName] = [];
180153
}
181154

182155
$manager->setVolumes($volumes);
183156

184157
$volumesBuild = $this->volumeResolver->normalize(array_merge(
158+
$this->volumeResolver->getRootVolume(false),
185159
$this->volumeResolver->getDefaultMagentoVolumes(false, $hasGenerated),
186160
$this->volumeResolver->getComposerVolumes()
187161
));
188162
$volumesRo = $this->volumeResolver->normalize(array_merge(
189-
$this->volumeResolver->getMagentoVolumes($mounts, true, $hasSelenium, $hasGenerated),
163+
$this->volumeResolver->getRootVolume(true),
164+
$this->volumeResolver->getDevVolumes($hasSelenium),
165+
$this->volumeResolver->getMagentoVolumes($mounts, true, $hasGenerated),
190166
$this->volumeResolver->getMountVolumes($hasTmpMounts)
191167
));
192168
$volumesRw = $this->volumeResolver->normalize(array_merge(
193-
$this->volumeResolver->getMagentoVolumes($mounts, false, $hasSelenium, $hasGenerated),
169+
$this->volumeResolver->getRootVolume(false),
170+
$this->volumeResolver->getDevVolumes($hasSelenium),
171+
$this->volumeResolver->getMagentoVolumes($mounts, false, $hasGenerated),
194172
$this->volumeResolver->getMountVolumes($hasTmpMounts),
195173
$this->volumeResolver->getComposerVolumes()
196174
));
197175
$volumesMount = $this->volumeResolver->normalize(
198176
$this->volumeResolver->getMountVolumes($hasTmpMounts)
199177
);
200178

201-
$volumePrefix = $config->getNameWithPrefix();
202-
203-
if ($config->hasMariaDbConf()) {
204-
$manager->addVolume(
205-
$volumePrefix . self::VOLUME_MARIADB_CONF,
206-
$this->getVolumeConfig('/.docker/mysql/mariadb.conf.d')
207-
);
208-
}
209-
210179
$this->addDbService($manager, $config, self::SERVICE_DB, $dbVersion, $volumesMount);
211180

212181
if ($config->hasServiceEnabled(ServiceInterface::SERVICE_DB_QUOTE)) {
@@ -228,7 +197,7 @@ public function build(Config $config): Manager
228197
$service,
229198
$this->serviceFactory->create(
230199
(string)$service,
231-
(string)$config->getServiceVersion($service),
200+
$config->getServiceVersion($service),
232201
$this->getServiceConfig($service, $config)
233202
),
234203
[self::NETWORK_MAGENTO],
@@ -509,7 +478,7 @@ private function addDbService(
509478
$volumePrefix = $config->getNameWithPrefix();
510479

511480
if ($config->hasMariaDbConf()) {
512-
$mounts[] = $volumePrefix . self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
481+
$mounts[] = self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
513482
}
514483

515484
$commands = [];
@@ -523,10 +492,6 @@ private function addDbService(
523492
$mounts[] = $volumePrefix . self::VOLUME_MAGENTO_DB . ':/var/lib/mysql';
524493

525494
if ($config->hasDbEntrypoint()) {
526-
$manager->addVolume(
527-
self::VOLUME_DOCKER_ETRYPOINT,
528-
$this->getVolumeConfig('/.docker/mysql/docker-entrypoint-initdb.d')
529-
);
530495
$mounts[] = self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';
531496
}
532497

@@ -545,10 +510,6 @@ private function addDbService(
545510
$port = $config->getDbQuotePortsExpose();
546511

547512
$manager->addVolume(self::VOLUME_MAGENTO_DB_QUOTE, []);
548-
$manager->addVolume(
549-
self::VOLUME_DOCKER_ETRYPOINT_QUOTE,
550-
$this->getVolumeConfig('/.docker/mysql-quote/docker-entrypoint-initdb.d')
551-
);
552513

553514
$mounts[] = self::VOLUME_MAGENTO_DB_QUOTE . ':/var/lib/mysql';
554515
$mounts[] = self::VOLUME_DOCKER_ETRYPOINT_QUOTE . ':/docker-entrypoint-initdb.d';
@@ -558,12 +519,6 @@ private function addDbService(
558519
$port = $config->getDbSalesPortsExpose();
559520

560521
$manager->addVolume(self::VOLUME_MAGENTO_DB_SALES, []);
561-
$manager->addVolume(
562-
self::VOLUME_DOCKER_ETRYPOINT_SALES,
563-
$this->getVolumeConfig(
564-
'/.docker/mysql-sales/docker-entrypoint-initdb.d'
565-
)
566-
);
567522

568523
$mounts[] = self::VOLUME_MAGENTO_DB_SALES . ':/var/lib/mysql';
569524
$mounts[] = self::VOLUME_DOCKER_ETRYPOINT_SALES . ':/docker-entrypoint-initdb.d';
@@ -632,19 +587,4 @@ private function getServiceConfig(string $service, Config $config): array
632587

633588
return $serviceConfig;
634589
}
635-
636-
/**
637-
* @param string $device
638-
* @return array
639-
*/
640-
private function getVolumeConfig(string $device = '/'): array
641-
{
642-
return [
643-
'driver_opts' => [
644-
'type' => 'none',
645-
'device' => $this->resolver->getRootPath($device),
646-
'o' => 'bind'
647-
]
648-
];
649-
}
650590
}

0 commit comments

Comments
 (0)