Skip to content

Commit 05babc0

Browse files
committed
fix: required changes for ARM to build
1 parent 98553c6 commit 05babc0

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

docker/toolbox/latest/Dockerfile.jinja2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{{ docker.fromOfficial("alpine") }}
2+
ARG TARGETARCH
23

34
RUN apk add --no-cache \
45
ca-certificates \

template/Dockerfile/images/php.jinja2

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
&& cd /usr/src/php/ext/amqp && git submodule update --init \
7878
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
7979
{%- endif %}
80-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
80+
&& docker-php-ext-configure ldap \
8181
{%- if version != '8.4' %}
8282
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
83-
{%- endif %}
83+
{%- endif %}
8484
&& docker-php-ext-install \
8585
bcmath \
8686
{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %}
@@ -248,7 +248,7 @@
248248
icu-dev \
249249
postgresql-dev \
250250
libxml2-dev \
251-
ldb-dev \
251+
samba-dev \
252252
pcre-dev \
253253
libxslt-dev \
254254
libzip-dev \
@@ -279,7 +279,7 @@
279279
&& docker-php-ext-configure ldap \
280280
{%- if version != '8.4' %}
281281
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
282-
{%- endif %}
282+
{%- endif %}
283283
&& docker-php-ext-install \
284284
bcmath \
285285
bz2 \
@@ -296,9 +296,9 @@
296296
gettext \
297297
ldap \
298298
mysqli \
299-
{%- if version != '8.4' %}
299+
{%- if version != '8.4' %}
300300
imap \
301-
{%- endif %}
301+
{%- endif %}
302302
{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %}
303303
hash \
304304
{%- endif %}
@@ -398,7 +398,7 @@
398398
icu-dev \
399399
postgresql-dev \
400400
libxml2-dev \
401-
ldb-dev \
401+
samba-dev \
402402
pcre-dev \
403403
libxslt-dev \
404404
libzip-dev \

template/Dockerfile/tools.jinja2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{% macro goreplace(path="/usr/local/bin", version="22.10.0") -%}
22
## Install go-replace
3-
&& wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.amd64" \
3+
&& wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.$TARGETARCH" \
44
&& chmod +x "{{ path }}/go-replace" \
55
&& "{{ path }}/go-replace" --version
66
{%- endmacro %}
77

8-
{% macro gosu(path="/sbin", arch="amd64", version="1.10") -%}
8+
{% macro gosu(path="/sbin", version="1.10") -%}
99
# Install gosu
10-
&& wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}" \
11-
&& wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-{{ arch }}.asc" \
10+
&& wget -O "{{ path }}/gosu" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH" \
11+
&& wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/{{ version }}/gosu-$TARGETARCH.asc" \
1212
&& export GNUPGHOME="$(mktemp -d)" \
1313
&& gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1414
&& gpg --batch --verify /tmp/gosu.asc "{{ path }}/gosu" \

0 commit comments

Comments
 (0)