Skip to content

Commit 8f4a804

Browse files
BaDosBaDos
authored
MCLOUD-7989: No ARM images available for development on Macbook Pro M1 CPU (#63)
1 parent e7b85a3 commit 8f4a804

File tree

34 files changed

+369
-204
lines changed

34 files changed

+369
-204
lines changed

‎images/mailhog/1.0/Dockerfile‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
# MailHog Dockerfile
3+
#
4+
5+
FROM golang:1.17.9-alpine
6+
7+
# Install MailHog:
8+
RUN apk --no-cache add --virtual build-dependencies \
9+
git \
10+
&& mkdir -p /root/gocode \
11+
&& export GOPATH=/root/gocode \
12+
&& go get github.com/mailhog/MailHog@v1.0.1 \
13+
&& mv /root/gocode/bin/MailHog /usr/local/bin \
14+
&& rm -rf /root/gocode \
15+
&& apk del --purge build-dependencies
16+
17+
# Add mailhog user/group with uid/gid 1000.
18+
# This is a workaround for boot2docker issue #581, see
19+
# https://github.com/boot2docker/boot2docker/issues/581
20+
RUN adduser -D -u 1000 mailhog
21+
22+
USER mailhog
23+
24+
WORKDIR /home/mailhog
25+
26+
ENTRYPOINT ["MailHog"]
27+
28+
# Expose the SMTP and HTTP ports:
29+
EXPOSE 1025 8025

‎images/php/7.2-cli/Dockerfile‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
# This file is automatically generated. Do not edit directly. #
2+
FROM golang:1.15 AS builder
3+
4+
RUN if [ $(uname -m) = "x86_64" ]; then mailhog_arch="amd64"; else mailhog_arch="arm64"; fi \
5+
&& wget -O mhsendmail.tar.gz https://github.com/mailhog/mhsendmail/archive/refs/tags/v0.2.0.tar.gz \
6+
&& tar -xf mhsendmail.tar.gz \
7+
&& mkdir -p ./src/github.com/mailhog/ \
8+
&& mv ./mhsendmail-0.2.0 ./src/github.com/mailhog/mhsendmail \
9+
&& cd ./src/github.com/mailhog/mhsendmail/ \
10+
&& go get . \
11+
&& GOOS=linux GOARCH=${mailhog_arch} go build -o mhsendmail .
12+
213
FROM php:7.2-cli
314

415
ARG COMPOSER_VERSION=1.10.22
@@ -75,17 +86,14 @@ RUN pip3 install --upgrade setuptools \
7586
RUN npm install -g grunt-cli
7687

7788
# Install MailHog
78-
RUN curl -L -O https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
79-
&& sudo chmod +x mhsendmail_linux_amd64 \
80-
&& sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
89+
COPY --from=builder /go/src/github.com/mailhog/mhsendmail/mhsendmail /usr/local/bin/
90+
RUN sudo chmod +x /usr/local/bin/mhsendmail
8191

8292
# Configure the gd library
8393
RUN docker-php-ext-configure \
8494
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
8595
RUN docker-php-ext-configure \
8696
imap --with-kerberos --with-imap-ssl
87-
RUN docker-php-ext-configure \
88-
ldap --with-libdir=lib/x86_64-linux-gnu
8997
RUN docker-php-ext-configure \
9098
opcache --enable-opcache
9199
RUN docker-php-ext-configure \
@@ -102,7 +110,6 @@ RUN docker-php-ext-install -j$(nproc) \
102110
gmp \
103111
imap \
104112
intl \
105-
ldap \
106113
mysqli \
107114
opcache \
108115
pdo_mysql \
@@ -136,12 +143,13 @@ RUN pecl install -o -f \
136143
xdebug-3.1.2 \
137144
yaml
138145

139-
RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
140-
&& mkdir -p /tmp/blackfire \
141-
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
142-
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
143-
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
144-
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
146+
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
147+
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
148+
&& apt-get update \
149+
&& apt-get install blackfire-php \
150+
&& rm -rf /var/lib/apt/lists/*
151+
RUN if [ $(uname -m) = "x86_64" ]; then ldap_arch="x86_64-linux-gnu"; else ldap_arch="aarch64-linux-gnu"; fi \
152+
&& docker-php-ext-configure ldap --with-libdir=lib/${ldap_arch}
145153
RUN mkdir -p /tmp/zoo \
146154
&& cd /tmp/zoo \
147155
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
@@ -172,13 +180,14 @@ RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
172180
&& rm -rf /tmp/libsodium \
173181
&& pecl install -o -f libsodium
174182
RUN cd /tmp \
175-
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
176-
&& tar zxvf ioncube_loaders_lin_x86-64.tar.gz \
183+
&& if [ $(uname -m) = "x86_64" ]; then ioncube_arch="x86-64"; else ioncube_arch="aarch64"; fi \
184+
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${ioncube_arch}.tar.gz \
185+
&& tar zxvf ioncube_loaders_lin_${ioncube_arch}.tar.gz \
177186
&& export PHP_VERSION=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") \
178187
&& export PHP_EXT_DIR=$(php-config --extension-dir) \
179188
&& cp "./ioncube/ioncube_loader_lin_${PHP_VERSION}.so" "${PHP_EXT_DIR}/ioncube.so" \
180189
&& rm -rf ./ioncube \
181-
&& rm ioncube_loaders_lin_x86-64.tar.gz
190+
&& rm ioncube_loaders_lin_${ioncube_arch}.tar.gz
182191

183192
ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
184193
ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
@@ -213,7 +222,7 @@ RUN mkdir -p ${MAGENTO_ROOT}
213222
VOLUME ${MAGENTO_ROOT}
214223

215224
RUN chown -R www:www /usr/local /var/www /var/log /usr/local/etc/php/conf.d /etc/cron.d ${MAGENTO_ROOT} ${COMPOSER_HOME}
216-
RUN if [[ ! -z "${CRONTAB}" ]]; then echo "${CRONTAB}" > /etc/cron.d/magento && touch /var/log/cron.log ; fi
225+
RUN if [ ! -z "${CRONTAB}" ]; then echo "${CRONTAB}" > /etc/cron.d/magento && touch /var/log/cron.log ; fi
217226

218227
ENTRYPOINT ["/docker-entrypoint.sh"]
219228

‎images/php/7.2-fpm/Dockerfile‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
# This file is automatically generated. Do not edit directly. #
2+
FROM golang:1.15 AS builder
3+
4+
RUN if [ $(uname -m) = "x86_64" ]; then mailhog_arch="amd64"; else mailhog_arch="arm64"; fi \
5+
&& wget -O mhsendmail.tar.gz https://github.com/mailhog/mhsendmail/archive/refs/tags/v0.2.0.tar.gz \
6+
&& tar -xf mhsendmail.tar.gz \
7+
&& mkdir -p ./src/github.com/mailhog/ \
8+
&& mv ./mhsendmail-0.2.0 ./src/github.com/mailhog/mhsendmail \
9+
&& cd ./src/github.com/mailhog/mhsendmail/ \
10+
&& go get . \
11+
&& GOOS=linux GOARCH=${mailhog_arch} go build -o mhsendmail .
12+
213
FROM php:7.2-fpm
314

415
ARG MAGENTO_ROOT=/app
@@ -50,17 +61,14 @@ RUN apt-get update \
5061
&& rm -rf /var/lib/apt/lists/*
5162

5263
# Install MailHog
53-
RUN curl -L -O https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
54-
&& sudo chmod +x mhsendmail_linux_amd64 \
55-
&& sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
64+
COPY --from=builder /go/src/github.com/mailhog/mhsendmail/mhsendmail /usr/local/bin/
65+
RUN sudo chmod +x /usr/local/bin/mhsendmail
5666

5767
# Configure the gd library
5868
RUN docker-php-ext-configure \
5969
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
6070
RUN docker-php-ext-configure \
6171
imap --with-kerberos --with-imap-ssl
62-
RUN docker-php-ext-configure \
63-
ldap --with-libdir=lib/x86_64-linux-gnu
6472
RUN docker-php-ext-configure \
6573
opcache --enable-opcache
6674
RUN docker-php-ext-configure \
@@ -77,7 +85,6 @@ RUN docker-php-ext-install -j$(nproc) \
7785
gmp \
7886
imap \
7987
intl \
80-
ldap \
8188
mysqli \
8289
opcache \
8390
pdo_mysql \
@@ -111,12 +118,13 @@ RUN pecl install -o -f \
111118
xdebug-3.1.2 \
112119
yaml
113120

114-
RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
115-
&& mkdir -p /tmp/blackfire \
116-
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
117-
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
118-
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
119-
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
121+
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
122+
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
123+
&& apt-get update \
124+
&& apt-get install blackfire-php \
125+
&& rm -rf /var/lib/apt/lists/*
126+
RUN if [ $(uname -m) = "x86_64" ]; then ldap_arch="x86_64-linux-gnu"; else ldap_arch="aarch64-linux-gnu"; fi \
127+
&& docker-php-ext-configure ldap --with-libdir=lib/${ldap_arch}
120128
RUN mkdir -p /tmp/zoo \
121129
&& cd /tmp/zoo \
122130
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
@@ -147,13 +155,14 @@ RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
147155
&& rm -rf /tmp/libsodium \
148156
&& pecl install -o -f libsodium
149157
RUN cd /tmp \
150-
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
151-
&& tar zxvf ioncube_loaders_lin_x86-64.tar.gz \
158+
&& if [ $(uname -m) = "x86_64" ]; then ioncube_arch="x86-64"; else ioncube_arch="aarch64"; fi \
159+
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${ioncube_arch}.tar.gz \
160+
&& tar zxvf ioncube_loaders_lin_${ioncube_arch}.tar.gz \
152161
&& export PHP_VERSION=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") \
153162
&& export PHP_EXT_DIR=$(php-config --extension-dir) \
154163
&& cp "./ioncube/ioncube_loader_lin_${PHP_VERSION}.so" "${PHP_EXT_DIR}/ioncube.so" \
155164
&& rm -rf ./ioncube \
156-
&& rm ioncube_loaders_lin_x86-64.tar.gz
165+
&& rm ioncube_loaders_lin_${ioncube_arch}.tar.gz
157166

158167
COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
159168
COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini

‎images/php/7.3-cli/Dockerfile‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
# This file is automatically generated. Do not edit directly. #
2+
FROM golang:1.15 AS builder
3+
4+
RUN if [ $(uname -m) = "x86_64" ]; then mailhog_arch="amd64"; else mailhog_arch="arm64"; fi \
5+
&& wget -O mhsendmail.tar.gz https://github.com/mailhog/mhsendmail/archive/refs/tags/v0.2.0.tar.gz \
6+
&& tar -xf mhsendmail.tar.gz \
7+
&& mkdir -p ./src/github.com/mailhog/ \
8+
&& mv ./mhsendmail-0.2.0 ./src/github.com/mailhog/mhsendmail \
9+
&& cd ./src/github.com/mailhog/mhsendmail/ \
10+
&& go get . \
11+
&& GOOS=linux GOARCH=${mailhog_arch} go build -o mhsendmail .
12+
213
FROM php:7.3-cli
314

415
ARG COMPOSER_VERSION=1.10.22
@@ -73,17 +84,14 @@ RUN pip3 install --upgrade setuptools \
7384
RUN npm install -g grunt-cli
7485

7586
# Install MailHog
76-
RUN curl -L -O https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
77-
&& sudo chmod +x mhsendmail_linux_amd64 \
78-
&& sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
87+
COPY --from=builder /go/src/github.com/mailhog/mhsendmail/mhsendmail /usr/local/bin/
88+
RUN sudo chmod +x /usr/local/bin/mhsendmail
7989

8090
# Configure the gd library
8191
RUN docker-php-ext-configure \
8292
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
8393
RUN docker-php-ext-configure \
8494
imap --with-kerberos --with-imap-ssl
85-
RUN docker-php-ext-configure \
86-
ldap --with-libdir=lib/x86_64-linux-gnu
8795
RUN docker-php-ext-configure \
8896
opcache --enable-opcache
8997
RUN docker-php-ext-configure \
@@ -100,7 +108,6 @@ RUN docker-php-ext-install -j$(nproc) \
100108
gmp \
101109
imap \
102110
intl \
103-
ldap \
104111
mysqli \
105112
opcache \
106113
pdo_mysql \
@@ -133,12 +140,13 @@ RUN pecl install -o -f \
133140
xdebug-3.1.2 \
134141
yaml
135142

136-
RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
137-
&& mkdir -p /tmp/blackfire \
138-
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
139-
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
140-
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
141-
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
143+
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
144+
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
145+
&& apt-get update \
146+
&& apt-get install blackfire-php \
147+
&& rm -rf /var/lib/apt/lists/*
148+
RUN if [ $(uname -m) = "x86_64" ]; then ldap_arch="x86_64-linux-gnu"; else ldap_arch="aarch64-linux-gnu"; fi \
149+
&& docker-php-ext-configure ldap --with-libdir=lib/${ldap_arch}
142150
RUN mkdir -p /tmp/zoo \
143151
&& cd /tmp/zoo \
144152
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
@@ -169,13 +177,14 @@ RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
169177
&& rm -rf /tmp/libsodium \
170178
&& pecl install -o -f libsodium
171179
RUN cd /tmp \
172-
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
173-
&& tar zxvf ioncube_loaders_lin_x86-64.tar.gz \
180+
&& if [ $(uname -m) = "x86_64" ]; then ioncube_arch="x86-64"; else ioncube_arch="aarch64"; fi \
181+
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${ioncube_arch}.tar.gz \
182+
&& tar zxvf ioncube_loaders_lin_${ioncube_arch}.tar.gz \
174183
&& export PHP_VERSION=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") \
175184
&& export PHP_EXT_DIR=$(php-config --extension-dir) \
176185
&& cp "./ioncube/ioncube_loader_lin_${PHP_VERSION}.so" "${PHP_EXT_DIR}/ioncube.so" \
177186
&& rm -rf ./ioncube \
178-
&& rm ioncube_loaders_lin_x86-64.tar.gz
187+
&& rm ioncube_loaders_lin_${ioncube_arch}.tar.gz
179188

180189
ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
181190
ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
@@ -210,7 +219,7 @@ RUN mkdir -p ${MAGENTO_ROOT}
210219
VOLUME ${MAGENTO_ROOT}
211220

212221
RUN chown -R www:www /usr/local /var/www /var/log /usr/local/etc/php/conf.d /etc/cron.d ${MAGENTO_ROOT} ${COMPOSER_HOME}
213-
RUN if [[ ! -z "${CRONTAB}" ]]; then echo "${CRONTAB}" > /etc/cron.d/magento && touch /var/log/cron.log ; fi
222+
RUN if [ ! -z "${CRONTAB}" ]; then echo "${CRONTAB}" > /etc/cron.d/magento && touch /var/log/cron.log ; fi
214223

215224
ENTRYPOINT ["/docker-entrypoint.sh"]
216225

‎images/php/7.3-fpm/Dockerfile‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
# This file is automatically generated. Do not edit directly. #
2+
FROM golang:1.15 AS builder
3+
4+
RUN if [ $(uname -m) = "x86_64" ]; then mailhog_arch="amd64"; else mailhog_arch="arm64"; fi \
5+
&& wget -O mhsendmail.tar.gz https://github.com/mailhog/mhsendmail/archive/refs/tags/v0.2.0.tar.gz \
6+
&& tar -xf mhsendmail.tar.gz \
7+
&& mkdir -p ./src/github.com/mailhog/ \
8+
&& mv ./mhsendmail-0.2.0 ./src/github.com/mailhog/mhsendmail \
9+
&& cd ./src/github.com/mailhog/mhsendmail/ \
10+
&& go get . \
11+
&& GOOS=linux GOARCH=${mailhog_arch} go build -o mhsendmail .
12+
213
FROM php:7.3-fpm
314

415
ARG MAGENTO_ROOT=/app
@@ -48,17 +59,14 @@ RUN apt-get update \
4859
&& rm -rf /var/lib/apt/lists/*
4960

5061
# Install MailHog
51-
RUN curl -L -O https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
52-
&& sudo chmod +x mhsendmail_linux_amd64 \
53-
&& sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
62+
COPY --from=builder /go/src/github.com/mailhog/mhsendmail/mhsendmail /usr/local/bin/
63+
RUN sudo chmod +x /usr/local/bin/mhsendmail
5464

5565
# Configure the gd library
5666
RUN docker-php-ext-configure \
5767
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
5868
RUN docker-php-ext-configure \
5969
imap --with-kerberos --with-imap-ssl
60-
RUN docker-php-ext-configure \
61-
ldap --with-libdir=lib/x86_64-linux-gnu
6270
RUN docker-php-ext-configure \
6371
opcache --enable-opcache
6472
RUN docker-php-ext-configure \
@@ -75,7 +83,6 @@ RUN docker-php-ext-install -j$(nproc) \
7583
gmp \
7684
imap \
7785
intl \
78-
ldap \
7986
mysqli \
8087
opcache \
8188
pdo_mysql \
@@ -108,12 +115,13 @@ RUN pecl install -o -f \
108115
xdebug-3.1.2 \
109116
yaml
110117

111-
RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
112-
&& mkdir -p /tmp/blackfire \
113-
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
114-
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
115-
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
116-
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
118+
RUN curl -L https://packages.blackfire.io/gpg.key | apt-key add \
119+
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
120+
&& apt-get update \
121+
&& apt-get install blackfire-php \
122+
&& rm -rf /var/lib/apt/lists/*
123+
RUN if [ $(uname -m) = "x86_64" ]; then ldap_arch="x86_64-linux-gnu"; else ldap_arch="aarch64-linux-gnu"; fi \
124+
&& docker-php-ext-configure ldap --with-libdir=lib/${ldap_arch}
117125
RUN mkdir -p /tmp/zoo \
118126
&& cd /tmp/zoo \
119127
&& git clone https://github.com/php-zookeeper/php-zookeeper.git \
@@ -144,13 +152,14 @@ RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
144152
&& rm -rf /tmp/libsodium \
145153
&& pecl install -o -f libsodium
146154
RUN cd /tmp \
147-
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
148-
&& tar zxvf ioncube_loaders_lin_x86-64.tar.gz \
155+
&& if [ $(uname -m) = "x86_64" ]; then ioncube_arch="x86-64"; else ioncube_arch="aarch64"; fi \
156+
&& curl -O https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${ioncube_arch}.tar.gz \
157+
&& tar zxvf ioncube_loaders_lin_${ioncube_arch}.tar.gz \
149158
&& export PHP_VERSION=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") \
150159
&& export PHP_EXT_DIR=$(php-config --extension-dir) \
151160
&& cp "./ioncube/ioncube_loader_lin_${PHP_VERSION}.so" "${PHP_EXT_DIR}/ioncube.so" \
152161
&& rm -rf ./ioncube \
153-
&& rm ioncube_loaders_lin_x86-64.tar.gz
162+
&& rm ioncube_loaders_lin_${ioncube_arch}.tar.gz
154163

155164
COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
156165
COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini

0 commit comments

Comments
 (0)