Skip to content

Commit e02b118

Browse files
oshmyheliukoshmyheliuk
authored
Merge pull request #61 from magento-commerce/develop
Merge develop into 1.2
2 parents d8e67a8 + e1209f3 commit e02b118

File tree

44 files changed

+1374
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1374
-15
lines changed

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-docker",
33
"description": "Magento Cloud Docker",
44
"type": "magento2-component",
5-
"version": "1.2.3",
5+
"version": "1.2.4",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
@@ -11,7 +11,7 @@
1111
"php": "^7.2",
1212
"ext-json": "*",
1313
"composer/composer": "^1.0||^2.0",
14-
"composer/semver": "^1.0",
14+
"composer/semver": "^1.0||^2.0||^3.0",
1515
"illuminate/config": "^5.5",
1616
"symfony/config": "^4.4",
1717
"symfony/console": "^2.8||^4.0",

‎config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Mailhog" />
4040
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Blackfire" />
4141
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Cron" />
42+
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Zookeeper" />
4243
</argument>
4344
</service>
4445
<service id="Magento\CloudDocker\Compose\ProductionBuilder" shared="false">

‎dist/mutagen.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
2-
mutagen terminate --label-selector=magento-docker
3-
mutagen terminate --label-selector=magento-docker-vendor
2+
mutagen sync terminate --label-selector=magento-docker
3+
mutagen sync terminate --label-selector=magento-docker-vendor
44

5-
mutagen create \
5+
mutagen sync create \
66
--label=magento-docker \
77
--sync-mode=two-way-resolved \
88
--default-file-mode=0644 \
@@ -20,7 +20,7 @@ mutagen create \
2020
--symlink-mode=posix-raw \
2121
./ docker://$(docker-compose ps -q fpm|awk '{print $1}')/app
2222

23-
mutagen create \
23+
mutagen sync create \
2424
--label=magento-docker-vendor \
2525
--sync-mode=two-way-resolved \
2626
--default-file-mode=0644 \

‎images/php/7.2-cli/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
136136
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
137137
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
138138
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
139+
RUN mkdir -p /tmp/zoo \
140+
&& cd /tmp/zoo \
141+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
142+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
143+
&& tar -xf zookeeper-3.4.14.tar.gz \
144+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
145+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
146+
&& ./configure \
147+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
148+
&& make \
149+
&& make install \
150+
&& ldconfig \
151+
&& cd /tmp/zoo/php-zookeeper \
152+
&& phpize \
153+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
154+
&& make \
155+
&& make install
139156
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
140157
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
141158
&& apt-get remove libsodium* -y \

‎images/php/7.2-fpm/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update \
1919
sendmail \
2020
sudo \
2121
iproute2 \
22+
git \
2223
libbz2-dev \
2324
libjpeg62-turbo-dev \
2425
libpng-dev \
@@ -113,6 +114,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
113114
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
114115
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
115116
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
117+
RUN mkdir -p /tmp/zoo \
118+
&& cd /tmp/zoo \
119+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
120+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
121+
&& tar -xf zookeeper-3.4.14.tar.gz \
122+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
123+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
124+
&& ./configure \
125+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
126+
&& make \
127+
&& make install \
128+
&& ldconfig \
129+
&& cd /tmp/zoo/php-zookeeper \
130+
&& phpize \
131+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
132+
&& make \
133+
&& make install
116134
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
117135
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
118136
&& apt-get remove libsodium* -y \

‎images/php/7.3-cli/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
133133
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
134134
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
135135
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
136+
RUN mkdir -p /tmp/zoo \
137+
&& cd /tmp/zoo \
138+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
139+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
140+
&& tar -xf zookeeper-3.4.14.tar.gz \
141+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
142+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
143+
&& ./configure \
144+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
145+
&& make \
146+
&& make install \
147+
&& ldconfig \
148+
&& cd /tmp/zoo/php-zookeeper \
149+
&& phpize \
150+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
151+
&& make \
152+
&& make install
136153
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
137154
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
138155
&& apt-get remove libsodium* -y \

‎images/php/7.3-fpm/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update \
1919
sendmail \
2020
sudo \
2121
iproute2 \
22+
git \
2223
libbz2-dev \
2324
libjpeg62-turbo-dev \
2425
libpng-dev \
@@ -110,6 +111,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
110111
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
111112
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
112113
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
114+
RUN mkdir -p /tmp/zoo \
115+
&& cd /tmp/zoo \
116+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
117+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
118+
&& tar -xf zookeeper-3.4.14.tar.gz \
119+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
120+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
121+
&& ./configure \
122+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
123+
&& make \
124+
&& make install \
125+
&& ldconfig \
126+
&& cd /tmp/zoo/php-zookeeper \
127+
&& phpize \
128+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
129+
&& make \
130+
&& make install
113131
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
114132
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
115133
&& apt-get remove libsodium* -y \

‎images/php/7.4-cli/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
123123
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
124124
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
125125
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
126+
RUN mkdir -p /tmp/zoo \
127+
&& cd /tmp/zoo \
128+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
129+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
130+
&& tar -xf zookeeper-3.4.14.tar.gz \
131+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
132+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
133+
&& ./configure \
134+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
135+
&& make \
136+
&& make install \
137+
&& ldconfig \
138+
&& cd /tmp/zoo/php-zookeeper \
139+
&& phpize \
140+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
141+
&& make \
142+
&& make install
126143
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
127144
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
128145
&& apt-get remove libsodium* -y \

‎images/php/7.4-fpm/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update \
1919
sendmail \
2020
sudo \
2121
iproute2 \
22+
git \
2223
libbz2-dev \
2324
libjpeg62-turbo-dev \
2425
libpng-dev \
@@ -100,6 +101,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
100101
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
101102
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
102103
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
104+
RUN mkdir -p /tmp/zoo \
105+
&& cd /tmp/zoo \
106+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
107+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
108+
&& tar -xf zookeeper-3.4.14.tar.gz \
109+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
110+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
111+
&& ./configure \
112+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
113+
&& make \
114+
&& make install \
115+
&& ldconfig \
116+
&& cd /tmp/zoo/php-zookeeper \
117+
&& phpize \
118+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
119+
&& make \
120+
&& make install
103121
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
104122
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
105123
&& apt-get remove libsodium* -y \

‎images/php/8.0-cli/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
116116
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
117117
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
118118
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
119+
RUN mkdir -p /tmp/zoo \
120+
&& cd /tmp/zoo \
121+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
122+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
123+
&& tar -xf zookeeper-3.4.14.tar.gz \
124+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
125+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
126+
&& ./configure \
127+
&& sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
128+
&& make \
129+
&& make install \
130+
&& ldconfig \
131+
&& cd /tmp/zoo/php-zookeeper \
132+
&& phpize \
133+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
134+
&& make \
135+
&& make install
119136
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
120137
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
121138
&& apt-get remove libsodium* -y \

0 commit comments

Comments
 (0)