Skip to content

Commit 6ffafc1

Browse files
BaDosBaDos
authored
MCLOUD-8000: Add Zookeper (#57)
1 parent f9c4171 commit 6ffafc1

File tree

42 files changed

+1368
-9
lines changed

Some content is hidden

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

42 files changed

+1368
-9
lines changed

‎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">

‎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 \

‎images/php/8.0-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 \
@@ -93,6 +94,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
9394
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
9495
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
9596
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
97+
RUN mkdir -p /tmp/zoo \
98+
&& cd /tmp/zoo \
99+
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
100+
&& curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
101+
&& tar -xf zookeeper-3.4.14.tar.gz \
102+
&& cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
103+
&& cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
104+
&& ./configure \
105+
&& 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 \
106+
&& make \
107+
&& make install \
108+
&& ldconfig \
109+
&& cd /tmp/zoo/php-zookeeper \
110+
&& phpize \
111+
&& ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
112+
&& make \
113+
&& make install
96114
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
97115
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
98116
&& apt-get remove libsodium* -y \

‎src/Command/BuildCompose.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,16 @@ protected function configure(): void
163163
null,
164164
InputOption::VALUE_REQUIRED,
165165
'Selenium image'
166+
)->addOption(
167+
Source\CliSource::OPTION_ZOOKEEPER_VERSION,
168+
null,
169+
InputOption::VALUE_REQUIRED,
170+
'Zookeeper version'
171+
)->addOption(
172+
Source\CliSource::OPTION_ZOOKEEPER_IMAGE,
173+
null,
174+
InputOption::VALUE_REQUIRED,
175+
'Zookeeper image'
166176
)->addOption(
167177
Source\CliSource::OPTION_NO_ES,
168178
null,
@@ -244,6 +254,11 @@ protected function configure(): void
244254
null,
245255
InputOption::VALUE_NONE,
246256
'Add Selenium latest version'
257+
)->addOption(
258+
Source\CliSource::OPTION_WITH_ZOOKEEPER,
259+
null,
260+
InputOption::VALUE_NONE,
261+
'Add Zookeeper latest version'
247262
)->addOption(
248263
Source\CliSource::OPTION_WITH_TEST,
249264
null,

0 commit comments

Comments
 (0)