Skip to content

Commit 2c1c36f

Browse files
bbatschebbatsche
authored
MCLOUD-7921: Update Service Versions (#47)
* Add new Elasticsearch versions * Add new Redis versions * Add new Varnish versions * Add PHP 7.4 images Update Node to v14 Remove distro designation from source image Remove docker-php-ext-enable step (this is done by the entrypoint) * Delete Redis images * Add Elasticsearch 7.11 image Update default VCL * Use Magento 2.3.7 for 7.4 SplitDbCest * Revert Node versions, bump composer version
1 parent 6becf08 commit 2c1c36f

File tree

20 files changed

+472
-330
lines changed

20 files changed

+472
-330
lines changed

‎images/elasticsearch/6.8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.8
1+
FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.15
22

33
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
44
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml

‎images/elasticsearch/7.11/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM docker.elastic.co/elasticsearch/elasticsearch:7.11.2
2+
3+
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
4+
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
5+
RUN bin/elasticsearch-plugin install -b analysis-icu && \
6+
bin/elasticsearch-plugin install -b analysis-phonetic
7+
8+
ADD docker-healthcheck.sh /docker-healthcheck.sh
9+
ADD docker-entrypoint.sh /docker-entrypoint.sh
10+
11+
HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
12+
13+
ENTRYPOINT ["/docker-entrypoint.sh"]
14+
15+
EXPOSE 9200 9300

‎images/elasticsearch/7.11/docker-entrypoint.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
if [[ -n "$ES_PLUGINS" ]]; then
5+
echo "Intalling plugins: $ES_PLUGNS"
6+
for PLUGIN in $ES_PLUGINS
7+
do
8+
./bin/elasticsearch-plugin install -b "$PLUGIN"
9+
done
10+
fi
11+
12+
/bin/bash /usr/local/bin/docker-entrypoint.sh

‎images/elasticsearch/7.11/docker-healthcheck.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -eo pipefail
3+
4+
if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
5+
health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
6+
if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
7+
exit 0
8+
fi
9+
echo >&2 "Unexpected health status: $health"
10+
fi
11+
12+
exit 1

‎images/php/7.2-cli/Dockerfile

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is automatically generated. Do not edit directly. #
2-
FROM php:7.2-cli-buster
2+
FROM php:7.2-cli
33
ARG GOSU_VERSION=1.11
44

55
ENV COMPOSER_MEMORY_LIMIT -1
@@ -138,15 +138,15 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
138138
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
139139
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
140140
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
141-
&& apt-get remove libsodium* -y \
142-
&& mkdir -p /tmp/libsodium \
141+
&& apt-get remove libsodium* -y \
142+
&& mkdir -p /tmp/libsodium \
143143
&& curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C /tmp/libsodium \
144144
&& cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
145145
&& ./configure \
146146
&& make && make check \
147-
&& make install \
147+
&& make install \
148148
&& cd / \
149-
&& rm -rf /tmp/libsodium \
149+
&& rm -rf /tmp/libsodium \
150150
&& pecl install -o -f libsodium
151151
RUN cd /tmp \
152152
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
@@ -157,59 +157,14 @@ RUN cd /tmp \
157157
&& rm -rf ./ioncube \
158158
&& rm ioncube_loaders_lin_x86-64.tar.gz
159159

160-
RUN docker-php-ext-enable \
161-
bcmath \
162-
blackfire \
163-
bz2 \
164-
calendar \
165-
exif \
166-
gd \
167-
geoip \
168-
gettext \
169-
gmp \
170-
gnupg \
171-
igbinary \
172-
imagick \
173-
imap \
174-
intl \
175-
ldap \
176-
mailparse \
177-
msgpack \
178-
mysqli \
179-
oauth \
180-
opcache \
181-
pcov \
182-
pdo_mysql \
183-
propro \
184-
pspell \
185-
raphf \
186-
recode \
187-
redis \
188-
shmop \
189-
soap \
190-
sockets \
191-
sodium \
192-
ssh2 \
193-
sysvmsg \
194-
sysvsem \
195-
sysvshm \
196-
tidy \
197-
xdebug \
198-
xmlrpc \
199-
xsl \
200-
yaml \
201-
zip \
202-
pcntl \
203-
ioncube
204-
205160
ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
206161
ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
207162
ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
208163
ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
209164
ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
210165

211166
# Get composer installed to /usr/local/bin/composer
212-
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
167+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.22 --filename=composer
213168

214169
ADD bin/* /usr/local/bin/
215170

‎images/php/7.2-fpm/Dockerfile

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is automatically generated. Do not edit directly. #
2-
FROM php:7.2-fpm-buster
2+
FROM php:7.2-fpm
33
ARG GOSU_VERSION=1.11
44

55
ENV PHP_MEMORY_LIMIT 2G
@@ -117,15 +117,15 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
117117
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
118118
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
119119
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
120-
&& apt-get remove libsodium* -y \
121-
&& mkdir -p /tmp/libsodium \
120+
&& apt-get remove libsodium* -y \
121+
&& mkdir -p /tmp/libsodium \
122122
&& curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C /tmp/libsodium \
123123
&& cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
124124
&& ./configure \
125125
&& make && make check \
126-
&& make install \
126+
&& make install \
127127
&& cd / \
128-
&& rm -rf /tmp/libsodium \
128+
&& rm -rf /tmp/libsodium \
129129
&& pecl install -o -f libsodium
130130
RUN cd /tmp \
131131
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
@@ -136,51 +136,6 @@ RUN cd /tmp \
136136
&& rm -rf ./ioncube \
137137
&& rm ioncube_loaders_lin_x86-64.tar.gz
138138

139-
RUN docker-php-ext-enable \
140-
bcmath \
141-
blackfire \
142-
bz2 \
143-
calendar \
144-
exif \
145-
gd \
146-
geoip \
147-
gettext \
148-
gmp \
149-
gnupg \
150-
igbinary \
151-
imagick \
152-
imap \
153-
intl \
154-
ldap \
155-
mailparse \
156-
msgpack \
157-
mysqli \
158-
oauth \
159-
opcache \
160-
pcov \
161-
pdo_mysql \
162-
propro \
163-
pspell \
164-
raphf \
165-
recode \
166-
redis \
167-
shmop \
168-
soap \
169-
sockets \
170-
sodium \
171-
ssh2 \
172-
sysvmsg \
173-
sysvsem \
174-
sysvshm \
175-
tidy \
176-
xdebug \
177-
xmlrpc \
178-
xsl \
179-
yaml \
180-
zip \
181-
pcntl \
182-
ioncube
183-
184139
RUN groupadd -g 1000 www && useradd -g 1000 -u 1000 -d ${MAGENTO_ROOT} -s /bin/bash www
185140

186141
COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini

‎images/php/7.3-cli/Dockerfile

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is automatically generated. Do not edit directly. #
2-
FROM php:7.3-cli-buster
2+
FROM php:7.3-cli
33
ARG GOSU_VERSION=1.11
44

55
ENV COMPOSER_MEMORY_LIMIT -1
@@ -135,15 +135,15 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
135135
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
136136
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
137137
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
138-
&& apt-get remove libsodium* -y \
139-
&& mkdir -p /tmp/libsodium \
138+
&& apt-get remove libsodium* -y \
139+
&& mkdir -p /tmp/libsodium \
140140
&& curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C /tmp/libsodium \
141141
&& cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
142142
&& ./configure \
143143
&& make && make check \
144-
&& make install \
144+
&& make install \
145145
&& cd / \
146-
&& rm -rf /tmp/libsodium \
146+
&& rm -rf /tmp/libsodium \
147147
&& pecl install -o -f libsodium
148148
RUN cd /tmp \
149149
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
@@ -154,58 +154,14 @@ RUN cd /tmp \
154154
&& rm -rf ./ioncube \
155155
&& rm ioncube_loaders_lin_x86-64.tar.gz
156156

157-
RUN docker-php-ext-enable \
158-
bcmath \
159-
blackfire \
160-
bz2 \
161-
calendar \
162-
exif \
163-
gd \
164-
geoip \
165-
gettext \
166-
gmp \
167-
gnupg \
168-
igbinary \
169-
imagick \
170-
imap \
171-
intl \
172-
ldap \
173-
mailparse \
174-
msgpack \
175-
mysqli \
176-
oauth \
177-
opcache \
178-
pcov \
179-
pdo_mysql \
180-
propro \
181-
pspell \
182-
raphf \
183-
recode \
184-
redis \
185-
shmop \
186-
soap \
187-
sockets \
188-
sodium \
189-
sysvmsg \
190-
sysvsem \
191-
sysvshm \
192-
tidy \
193-
xdebug \
194-
xmlrpc \
195-
xsl \
196-
yaml \
197-
zip \
198-
pcntl \
199-
ioncube
200-
201157
ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
202158
ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
203159
ADD etc/php-pcov.ini /usr/local/etc/php/conf.d/zz-pcov-settings.ini
204160
ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
205161
ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
206162

207163
# Get composer installed to /usr/local/bin/composer
208-
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
164+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.22 --filename=composer
209165

210166
ADD bin/* /usr/local/bin/
211167

‎images/php/7.3-fpm/Dockerfile

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is automatically generated. Do not edit directly. #
2-
FROM php:7.3-fpm-buster
2+
FROM php:7.3-fpm
33
ARG GOSU_VERSION=1.11
44

55
ENV PHP_MEMORY_LIMIT 2G
@@ -114,15 +114,15 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
114114
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
115115
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
116116
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \
117-
&& apt-get remove libsodium* -y \
118-
&& mkdir -p /tmp/libsodium \
117+
&& apt-get remove libsodium* -y \
118+
&& mkdir -p /tmp/libsodium \
119119
&& curl -sL https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz | tar xzf - -C /tmp/libsodium \
120120
&& cd /tmp/libsodium/libsodium-1.0.18-RELEASE/ \
121121
&& ./configure \
122122
&& make && make check \
123-
&& make install \
123+
&& make install \
124124
&& cd / \
125-
&& rm -rf /tmp/libsodium \
125+
&& rm -rf /tmp/libsodium \
126126
&& pecl install -o -f libsodium
127127
RUN cd /tmp \
128128
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
@@ -133,50 +133,6 @@ RUN cd /tmp \
133133
&& rm -rf ./ioncube \
134134
&& rm ioncube_loaders_lin_x86-64.tar.gz
135135

136-
RUN docker-php-ext-enable \
137-
bcmath \
138-
blackfire \
139-
bz2 \
140-
calendar \
141-
exif \
142-
gd \
143-
geoip \
144-
gettext \
145-
gmp \
146-
gnupg \
147-
igbinary \
148-
imagick \
149-
imap \
150-
intl \
151-
ldap \
152-
mailparse \
153-
msgpack \
154-
mysqli \
155-
oauth \
156-
opcache \
157-
pcov \
158-
pdo_mysql \
159-
propro \
160-
pspell \
161-
raphf \
162-
recode \
163-
redis \
164-
shmop \
165-
soap \
166-
sockets \
167-
sodium \
168-
sysvmsg \
169-
sysvsem \
170-
sysvshm \
171-
tidy \
172-
xdebug \
173-
xmlrpc \
174-
xsl \
175-
yaml \
176-
zip \
177-
pcntl \
178-
ioncube
179-
180136
RUN groupadd -g 1000 www && useradd -g 1000 -u 1000 -d ${MAGENTO_ROOT} -s /bin/bash www
181137

182138
COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini

0 commit comments

Comments
 (0)