Skip to content

Fixes #530 ARM Build #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes #530 ARM Build #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05babc0
fix: required changes for ARM to build
wezzle Sep 29, 2025
1e5f5a1
chore: resuling changes in Dockerfiles
wezzle Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker/php-official/8.4-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
APPLICATION_PATH=/app \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
ENV COMPOSER_VERSION="2"

Expand Down Expand Up @@ -125,7 +125,7 @@ RUN set -x \
icu-dev \
postgresql-dev \
libxml2-dev \
ldb-dev \
samba-dev \
pcre-dev \
libxslt-dev \
libzip-dev \
Expand All @@ -148,7 +148,7 @@ RUN set -x \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& docker-php-ext-configure ldap \
&& docker-php-ext-configure ldap \
&& docker-php-ext-install \
bcmath \
bz2 \
Expand Down Expand Up @@ -228,7 +228,7 @@ RUN set -x \
icu-dev \
postgresql-dev \
libxml2-dev \
ldb-dev \
samba-dev \
pcre-dev \
libxslt-dev \
libzip-dev \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/8.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ RUN set -x \
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& docker-php-ext-configure ldap \
&& docker-php-ext-install \
bcmath \
amqp \
Expand Down
7 changes: 4 additions & 3 deletions docker/toolbox/latest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#+++++++++++++++++++++++++++++++++++++++

FROM alpine:latest
ARG TARGETARCH

RUN apk add --no-cache \
ca-certificates \
Expand All @@ -29,13 +30,13 @@ RUN apk add --no-cache \
&& wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \
&& sh /tmp/baselayout-install.sh /baselayout \
## Install go-replace
&& wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.amd64" \
&& wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.$TARGETARCH" \
&& chmod +x "/baselayout/usr/local/bin/go-replace" \
&& "/baselayout/usr/local/bin/go-replace" --version \
&& ln -s /baselayout/usr/local/bin/go-replace /usr/local/bin/ \
# Install gosu
&& wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \
&& wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \
&& wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \
&& wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \
Expand Down
1 change: 1 addition & 0 deletions docker/toolbox/latest/Dockerfile.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ docker.fromOfficial("alpine") }}
ARG TARGETARCH

RUN apk add --no-cache \
ca-certificates \
Expand Down
14 changes: 7 additions & 7 deletions template/Dockerfile/images/php.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
{%- endif %}
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& docker-php-ext-configure ldap \
{%- if version != '8.4' %}
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
{%- endif %}
{%- endif %}
&& docker-php-ext-install \
bcmath \
{%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' or version == '8.4' %}
Expand Down Expand Up @@ -248,7 +248,7 @@
icu-dev \
postgresql-dev \
libxml2-dev \
ldb-dev \
samba-dev \
pcre-dev \
libxslt-dev \
libzip-dev \
Expand Down Expand Up @@ -279,7 +279,7 @@
&& docker-php-ext-configure ldap \
{%- if version != '8.4' %}
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
{%- endif %}
{%- endif %}
&& docker-php-ext-install \
bcmath \
bz2 \
Expand All @@ -296,9 +296,9 @@
gettext \
ldap \
mysqli \
{%- if version != '8.4' %}
{%- if version != '8.4' %}
imap \
{%- endif %}
{%- endif %}
{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' and version != '8.3' and version != '8.4' %}
hash \
{%- endif %}
Expand Down Expand Up @@ -398,7 +398,7 @@
icu-dev \
postgresql-dev \
libxml2-dev \
ldb-dev \
samba-dev \
pcre-dev \
libxslt-dev \
libzip-dev \
Expand Down
8 changes: 4 additions & 4 deletions template/Dockerfile/tools.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{% macro goreplace(path="/usr/local/bin", version="22.10.0") -%}
## Install go-replace
&& wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.amd64" \
&& wget -O "{{ path }}/go-replace" "https://github.com/webdevops/go-replace/releases/download/{{ version }}/go-replace.linux.$TARGETARCH" \
&& chmod +x "{{ path }}/go-replace" \
&& "{{ path }}/go-replace" --version
{%- endmacro %}

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