Skip to content

Commit 1e5f5a1

Browse files
committed
chore: resuling changes in Dockerfiles
Can revert this commit as they should be auto-generated
1 parent 05babc0 commit 1e5f5a1

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

docker/php-official/8.4-alpine/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
2222
APPLICATION_PATH=/app \
2323
APPLICATION_UID=1000 \
2424
APPLICATION_GID=1000
25-
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
25+
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
2626
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
2727
ENV COMPOSER_VERSION="2"
2828

@@ -125,7 +125,7 @@ RUN set -x \
125125
icu-dev \
126126
postgresql-dev \
127127
libxml2-dev \
128-
ldb-dev \
128+
samba-dev \
129129
pcre-dev \
130130
libxslt-dev \
131131
libzip-dev \
@@ -148,7 +148,7 @@ RUN set -x \
148148
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
149149
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
150150
&& cd /usr/src/php/ext/amqp && git submodule update --init \
151-
&& docker-php-ext-configure ldap \
151+
&& docker-php-ext-configure ldap \
152152
&& docker-php-ext-install \
153153
bcmath \
154154
bz2 \
@@ -228,7 +228,7 @@ RUN set -x \
228228
icu-dev \
229229
postgresql-dev \
230230
libxml2-dev \
231-
ldb-dev \
231+
samba-dev \
232232
pcre-dev \
233233
libxslt-dev \
234234
libzip-dev \

docker/php-official/8.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ RUN set -x \
143143
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
144144
&& cd /usr/src/php/ext/amqp && git submodule update --init \
145145
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
146-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
146+
&& docker-php-ext-configure ldap \
147147
&& docker-php-ext-install \
148148
bcmath \
149149
amqp \

docker/toolbox/latest/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#+++++++++++++++++++++++++++++++++++++++
55

66
FROM alpine:latest
7+
ARG TARGETARCH
78

89
RUN apk add --no-cache \
910
ca-certificates \
@@ -29,13 +30,13 @@ RUN apk add --no-cache \
2930
&& wget -O /tmp/baselayout-install.sh https://raw.githubusercontent.com/webdevops/Docker-Image-Baselayout/master/install.sh \
3031
&& sh /tmp/baselayout-install.sh /baselayout \
3132
## Install go-replace
32-
&& wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.amd64" \
33+
&& wget -O "/baselayout/usr/local/bin/go-replace" "https://github.com/webdevops/go-replace/releases/download/22.10.0/go-replace.linux.$TARGETARCH" \
3334
&& chmod +x "/baselayout/usr/local/bin/go-replace" \
3435
&& "/baselayout/usr/local/bin/go-replace" --version \
3536
&& ln -s /baselayout/usr/local/bin/go-replace /usr/local/bin/ \
3637
# Install gosu
37-
&& wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" \
38-
&& wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" \
38+
&& wget -O "/baselayout/sbin/gosu" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH" \
39+
&& wget -O "/tmp/gosu.asc" "https://github.com/tianon/gosu/releases/download/1.10/gosu-$TARGETARCH.asc" \
3940
&& export GNUPGHOME="$(mktemp -d)" \
4041
&& gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
4142
&& gpg --batch --verify /tmp/gosu.asc "/baselayout/sbin/gosu" \

0 commit comments

Comments
 (0)