Skip to content

Commit dead3a2

Browse files
oshmyheliukoshmyheliuk
authored
Merge branch 'develop' into imported-magento-magento-cloud-docker-298
2 parents e146e9b + 22fcd62 commit dead3a2

File tree

19 files changed

+288
-32
lines changed

19 files changed

+288
-32
lines changed

‎images/php/7.2-cli/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
134134
&& mkdir -p /tmp/blackfire \
135135
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
136136
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
137-
&& ( echo extension=blackfire.so \
138-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
137+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
139138
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
140139
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
141140
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

‎images/php/7.2-fpm/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
113113
&& mkdir -p /tmp/blackfire \
114114
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
115115
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
116-
&& ( echo extension=blackfire.so \
117-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
116+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
118117
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
119118
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
120119
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

‎images/php/7.3-cli/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
131131
&& mkdir -p /tmp/blackfire \
132132
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
133133
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
134-
&& ( echo extension=blackfire.so \
135-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
134+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
136135
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
137136
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
138137
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

‎images/php/7.3-fpm/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
110110
&& mkdir -p /tmp/blackfire \
111111
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
112112
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
113-
&& ( echo extension=blackfire.so \
114-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
113+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
115114
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
116115
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
117116
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

‎images/php/7.4-cli/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
121121
&& mkdir -p /tmp/blackfire \
122122
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
123123
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
124-
&& ( echo extension=blackfire.so \
125-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
124+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
126125
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
127126
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
128127
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

‎images/php/7.4-fpm/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
100100
&& mkdir -p /tmp/blackfire \
101101
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
102102
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
103-
&& ( echo extension=blackfire.so \
104-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
103+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
105104
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
106105
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
107106
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

‎src/Compose/BuilderInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ interface BuilderInterface
4848
public const VOLUME_MAGENTO_DB_QUOTE = 'magento-db-quote';
4949
public const VOLUME_MAGENTO_DB_SALES = 'magento-db-sales';
5050
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';
51+
public const VOLUME_DOCKER_ENTRYPOINT = '.docker/mysql/docker-entrypoint-initdb.d';
52+
public const VOLUME_DOCKER_ENTRYPOINT_QUOTE = '.docker/mysql-quote/docker-entrypoint-initdb.d';
53+
public const VOLUME_DOCKER_ENTRYPOINT_SALES = '.docker/mysql-sales/docker-entrypoint-initdb.d';
5454

5555
public const SYNC_ENGINE_NATIVE = 'native';
5656

‎src/Compose/DeveloperBuilder.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Magento\CloudDocker\Compose;
99

10-
use Magento\CloudDocker\App\ConfigurationMismatchException;
1110
use Magento\CloudDocker\Compose\Php\ExtensionResolver;
1211
use Magento\CloudDocker\Config\Config;
1312
use Magento\CloudDocker\Config\Environment\Converter;
@@ -97,14 +96,6 @@ public function build(Config $config): Manager
9796
$volumes = [$volumePrefix . self::VOLUME_MAGENTO_SYNC . ':' . self::DIR_MAGENTO . ':nocopy'];
9897
}
9998

100-
if ($config->hasMariaDbConf()) {
101-
$volumesList[$volumePrefix . self::VOLUME_MARIADB_CONF] = [];
102-
}
103-
104-
if ($config->hasDbEntrypoint()) {
105-
$volumesList[self::VOLUME_DOCKER_ETRYPOINT] = [];
106-
}
107-
10899
$manager->setVolumes($volumesList);
109100

110101
/**
@@ -129,11 +120,11 @@ public function build(Config $config): Manager
129120
];
130121

131122
if ($config->hasMariaDbConf()) {
132-
$dbVolumes[] = $volumePrefix . self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
123+
$dbVolumes[] = self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
133124
}
134125

135126
if ($config->hasDbEntrypoint()) {
136-
$dbVolumes[] = self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';
127+
$dbVolumes[] = self::VOLUME_DOCKER_ENTRYPOINT . ':/docker-entrypoint-initdb.d';
137128
}
138129

139130
$manager->updateService(self::SERVICE_DB, [

‎src/Compose/Php/ExtensionResolver.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ExtensionResolver
4646
'sysvsem',
4747
'sysvshm',
4848
'opcache',
49-
'zip',
49+
'zip'
5050
];
5151

5252
/**
@@ -172,8 +172,7 @@ public static function getConfig(): array
172172
mkdir -p /tmp/blackfire
173173
tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire
174174
mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so
175-
( echo extension=blackfire.so
176-
echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini
175+
echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini
177176
rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
178177
BASH
179178
// phpcs:enable

‎src/Compose/ProductionBuilder/Service/Database/Db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private function getMounts(Config $config): array
118118
$mounts[] = $config->getNameWithPrefix() . BuilderInterface::VOLUME_MAGENTO_DB . ':/var/lib/mysql';
119119

120120
if ($config->hasDbEntrypoint()) {
121-
$mounts[] = BuilderInterface::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';
121+
$mounts[] = BuilderInterface::VOLUME_DOCKER_ENTRYPOINT . ':/docker-entrypoint-initdb.d';
122122
}
123123

124124
return $mounts;

0 commit comments

Comments
 (0)