Skip to content

Commit ef31324

Browse files
J0WIJ0WI
committed
PostfixAdmin 4.0.1
1 parent 7c8d83d commit ef31324

File tree

5 files changed

+136
-75
lines changed

5 files changed

+136
-75
lines changed

‎Dockerfile-alpine.template‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ RUN apk add --no-cache \
1010
RUN set -ex; \
1111
\
1212
apk add --no-cache --virtual .build-deps \
13-
imap-dev \
14-
krb5-dev \
1513
postgresql-dev \
1614
sqlite-dev \
1715
; \
18-
docker-php-ext-configure \
19-
imap --with-imap-ssl --with-kerberos \
20-
; \
2116
docker-php-ext-install -j "$(nproc)" \
22-
imap \
2317
pdo_mysql \
2418
pdo_pgsql \
2519
pdo_sqlite \
@@ -34,14 +28,14 @@ RUN set -ex; \
3428
apk add --no-network --virtual .postfixadmin-phpexts-rundeps $runDeps; \
3529
apk del --no-network .build-deps
3630

37-
ARG POSTFIXADMIN_VERSION=3.3.16
38-
ARG POSTFIXADMIN_SHA512=d1b8074c32f7912c187c2c37c5cca158432cb85fc415d9efe86cf11f70ab035117053cc579306e224cb180e70fa3c84a68335f18d62b43abf591e8105a00847d
31+
ARG POSTFIXADMIN_VERSION=4.0.1
32+
ARG POSTFIXADMIN_SHA512=88be6834257580c7a52dce33ce552e1868a1b28ba639a3378a66278939640073af4f8893fbfac690e2df5e67db0143c5726aab575bf0e4014b39a03d46916831
3933

4034
ENV POSTFIXADMIN_VERSION $POSTFIXADMIN_VERSION
4135
ENV POSTFIXADMIN_SHA512 $POSTFIXADMIN_SHA512
4236

4337
RUN set -eu; \
44-
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \
38+
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/v${POSTFIXADMIN_VERSION}.tar.gz"; \
4539
echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \
4640
# upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/
4741
mkdir /usr/src/postfixadmin; \
@@ -53,5 +47,19 @@ RUN set -eu; \
5347

5448
COPY docker-entrypoint.sh /usr/local/bin/
5549

50+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
51+
52+
# https://github.com/moby/buildkit/issues/4503
53+
# https://github.com/composer/composer/issues/11839
54+
# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218
55+
ENV COMPOSER_ALLOW_SUPERUSER 1
56+
57+
RUN set -eux; \
58+
export COMPOSER_HOME="$(mktemp -d)"; \
59+
# mysqli is expected but we use pdo
60+
composer install --ignore-platform-req=ext-mysqli --no-dev --no-interaction --working-dir /usr/src/postfixadmin; \
61+
# delete composer cache
62+
rm -rf "$COMPOSER_HOME"
63+
5664
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
5765
CMD ["%%CMD%%"]

‎Dockerfile-debian.template‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3-%%VARIANT%%-bookworm
1+
FROM php:8.3-%%VARIANT%%
22
LABEL maintainer="David Goodwin <david@codepoets.co.uk> (@DavidGoodwin)"
33

44
# docker-entrypoint.sh dependencies
@@ -16,40 +16,32 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19-
libc-client2007e-dev \
20-
libkrb5-dev \
21-
libpq-dev \
22-
libsqlite3-dev \
19+
libpq-dev \
20+
libsqlite3-dev \
2321
; \
24-
\
25-
docker-php-ext-configure \
26-
imap --with-imap-ssl --with-kerberos \
27-
; \
28-
\
2922
docker-php-ext-install -j "$(nproc)" \
30-
imap \
3123
pdo_mysql \
3224
pdo_pgsql \
3325
pdo_sqlite \
3426
pgsql \
3527
; \
36-
\
3728
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
3829
apt-mark auto '.*' > /dev/null; \
3930
apt-mark manual $savedAptMark; \
40-
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
31+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
4132
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
4233
| sort -u \
43-
| xargs -r dpkg-query --search \
44-
| cut -d: -f1 \
34+
| xargs -rt dpkg-query --search \
35+
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
36+
| awk 'sub(":$", "", $1) { print $1 }' \
4537
| sort -u \
4638
| xargs -rt apt-mark manual; \
4739
\
4840
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
49-
rm -rf /var/lib/apt/lists/*
41+
apt-get dist-clean
5042

51-
ARG POSTFIXADMIN_VERSION=3.3.16
52-
ARG POSTFIXADMIN_SHA512=d1b8074c32f7912c187c2c37c5cca158432cb85fc415d9efe86cf11f70ab035117053cc579306e224cb180e70fa3c84a68335f18d62b43abf591e8105a00847d
43+
ARG POSTFIXADMIN_VERSION=4.0.1
44+
ARG POSTFIXADMIN_SHA512=88be6834257580c7a52dce33ce552e1868a1b28ba639a3378a66278939640073af4f8893fbfac690e2df5e67db0143c5726aab575bf0e4014b39a03d46916831
5345

5446
ENV POSTFIXADMIN_VERSION $POSTFIXADMIN_VERSION
5547
ENV POSTFIXADMIN_SHA512 $POSTFIXADMIN_SHA512
@@ -59,7 +51,7 @@ RUN set -eu; sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2
5951
sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
6052

6153
RUN set -eu; \
62-
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \
54+
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/v${POSTFIXADMIN_VERSION}.tar.gz"; \
6355
echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \
6456
# upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/
6557
mkdir /usr/src/postfixadmin; \
@@ -71,5 +63,28 @@ RUN set -eu; \
7163

7264
COPY docker-entrypoint.sh /usr/local/bin/
7365

66+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
67+
68+
# https://github.com/moby/buildkit/issues/4503
69+
# https://github.com/composer/composer/issues/11839
70+
# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218
71+
ENV COMPOSER_ALLOW_SUPERUSER 1
72+
73+
RUN set -eux; \
74+
composerDeps=" \
75+
unzip \
76+
"; \
77+
apt-get update; \
78+
apt-get install -y --no-install-recommends $composerDeps; \
79+
\
80+
export COMPOSER_HOME="$(mktemp -d)"; \
81+
# mysqli is expected but we use pdo
82+
composer install --ignore-platform-req=ext-mysqli --no-dev --no-interaction --working-dir /usr/src/postfixadmin; \
83+
# delete composer cache
84+
rm -rf "$COMPOSER_HOME"; \
85+
\
86+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $composerDeps; \
87+
apt-get dist-clean
88+
7489
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
7590
CMD ["%%CMD%%"]

‎apache/Dockerfile‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3-apache-bookworm
1+
FROM php:8.3-apache
22
LABEL maintainer="David Goodwin <david@codepoets.co.uk> (@DavidGoodwin)"
33

44
# docker-entrypoint.sh dependencies
@@ -16,40 +16,32 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19-
libc-client2007e-dev \
20-
libkrb5-dev \
21-
libpq-dev \
22-
libsqlite3-dev \
19+
libpq-dev \
20+
libsqlite3-dev \
2321
; \
24-
\
25-
docker-php-ext-configure \
26-
imap --with-imap-ssl --with-kerberos \
27-
; \
28-
\
2922
docker-php-ext-install -j "$(nproc)" \
30-
imap \
3123
pdo_mysql \
3224
pdo_pgsql \
3325
pdo_sqlite \
3426
pgsql \
3527
; \
36-
\
3728
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
3829
apt-mark auto '.*' > /dev/null; \
3930
apt-mark manual $savedAptMark; \
40-
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
31+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
4132
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
4233
| sort -u \
43-
| xargs -r dpkg-query --search \
44-
| cut -d: -f1 \
34+
| xargs -rt dpkg-query --search \
35+
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
36+
| awk 'sub(":$", "", $1) { print $1 }' \
4537
| sort -u \
4638
| xargs -rt apt-mark manual; \
4739
\
4840
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
49-
rm -rf /var/lib/apt/lists/*
41+
apt-get dist-clean
5042

51-
ARG POSTFIXADMIN_VERSION=3.3.16
52-
ARG POSTFIXADMIN_SHA512=d1b8074c32f7912c187c2c37c5cca158432cb85fc415d9efe86cf11f70ab035117053cc579306e224cb180e70fa3c84a68335f18d62b43abf591e8105a00847d
43+
ARG POSTFIXADMIN_VERSION=4.0.1
44+
ARG POSTFIXADMIN_SHA512=88be6834257580c7a52dce33ce552e1868a1b28ba639a3378a66278939640073af4f8893fbfac690e2df5e67db0143c5726aab575bf0e4014b39a03d46916831
5345

5446
ENV POSTFIXADMIN_VERSION $POSTFIXADMIN_VERSION
5547
ENV POSTFIXADMIN_SHA512 $POSTFIXADMIN_SHA512
@@ -59,7 +51,7 @@ RUN set -eu; sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2
5951
sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
6052

6153
RUN set -eu; \
62-
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \
54+
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/v${POSTFIXADMIN_VERSION}.tar.gz"; \
6355
echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \
6456
# upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/
6557
mkdir /usr/src/postfixadmin; \
@@ -71,5 +63,28 @@ RUN set -eu; \
7163

7264
COPY docker-entrypoint.sh /usr/local/bin/
7365

66+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
67+
68+
# https://github.com/moby/buildkit/issues/4503
69+
# https://github.com/composer/composer/issues/11839
70+
# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218
71+
ENV COMPOSER_ALLOW_SUPERUSER 1
72+
73+
RUN set -eux; \
74+
composerDeps=" \
75+
unzip \
76+
"; \
77+
apt-get update; \
78+
apt-get install -y --no-install-recommends $composerDeps; \
79+
\
80+
export COMPOSER_HOME="$(mktemp -d)"; \
81+
# mysqli is expected but we use pdo
82+
composer install --ignore-platform-req=ext-mysqli --no-dev --no-interaction --working-dir /usr/src/postfixadmin; \
83+
# delete composer cache
84+
rm -rf "$COMPOSER_HOME"; \
85+
\
86+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $composerDeps; \
87+
apt-get dist-clean
88+
7489
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
7590
CMD ["apache2-foreground"]

‎fpm-alpine/Dockerfile‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ RUN apk add --no-cache \
1010
RUN set -ex; \
1111
\
1212
apk add --no-cache --virtual .build-deps \
13-
imap-dev \
14-
krb5-dev \
1513
postgresql-dev \
1614
sqlite-dev \
1715
; \
18-
docker-php-ext-configure \
19-
imap --with-imap-ssl --with-kerberos \
20-
; \
2116
docker-php-ext-install -j "$(nproc)" \
22-
imap \
2317
pdo_mysql \
2418
pdo_pgsql \
2519
pdo_sqlite \
@@ -34,14 +28,14 @@ RUN set -ex; \
3428
apk add --no-network --virtual .postfixadmin-phpexts-rundeps $runDeps; \
3529
apk del --no-network .build-deps
3630

37-
ARG POSTFIXADMIN_VERSION=3.3.16
38-
ARG POSTFIXADMIN_SHA512=d1b8074c32f7912c187c2c37c5cca158432cb85fc415d9efe86cf11f70ab035117053cc579306e224cb180e70fa3c84a68335f18d62b43abf591e8105a00847d
31+
ARG POSTFIXADMIN_VERSION=4.0.1
32+
ARG POSTFIXADMIN_SHA512=88be6834257580c7a52dce33ce552e1868a1b28ba639a3378a66278939640073af4f8893fbfac690e2df5e67db0143c5726aab575bf0e4014b39a03d46916831
3933

4034
ENV POSTFIXADMIN_VERSION $POSTFIXADMIN_VERSION
4135
ENV POSTFIXADMIN_SHA512 $POSTFIXADMIN_SHA512
4236

4337
RUN set -eu; \
44-
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \
38+
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/v${POSTFIXADMIN_VERSION}.tar.gz"; \
4539
echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \
4640
# upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/
4741
mkdir /usr/src/postfixadmin; \
@@ -53,5 +47,19 @@ RUN set -eu; \
5347

5448
COPY docker-entrypoint.sh /usr/local/bin/
5549

50+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
51+
52+
# https://github.com/moby/buildkit/issues/4503
53+
# https://github.com/composer/composer/issues/11839
54+
# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218
55+
ENV COMPOSER_ALLOW_SUPERUSER 1
56+
57+
RUN set -eux; \
58+
export COMPOSER_HOME="$(mktemp -d)"; \
59+
# mysqli is expected but we use pdo
60+
composer install --ignore-platform-req=ext-mysqli --no-dev --no-interaction --working-dir /usr/src/postfixadmin; \
61+
# delete composer cache
62+
rm -rf "$COMPOSER_HOME"
63+
5664
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
5765
CMD ["php-fpm"]

‎fpm/Dockerfile‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3-fpm-bookworm
1+
FROM php:8.3-fpm
22
LABEL maintainer="David Goodwin <david@codepoets.co.uk> (@DavidGoodwin)"
33

44
# docker-entrypoint.sh dependencies
@@ -16,47 +16,39 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19-
libc-client2007e-dev \
20-
libkrb5-dev \
21-
libpq-dev \
22-
libsqlite3-dev \
19+
libpq-dev \
20+
libsqlite3-dev \
2321
; \
24-
\
25-
docker-php-ext-configure \
26-
imap --with-imap-ssl --with-kerberos \
27-
; \
28-
\
2922
docker-php-ext-install -j "$(nproc)" \
30-
imap \
3123
pdo_mysql \
3224
pdo_pgsql \
3325
pdo_sqlite \
3426
pgsql \
3527
; \
36-
\
3728
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
3829
apt-mark auto '.*' > /dev/null; \
3930
apt-mark manual $savedAptMark; \
40-
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
31+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
4132
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
4233
| sort -u \
43-
| xargs -r dpkg-query --search \
44-
| cut -d: -f1 \
34+
| xargs -rt dpkg-query --search \
35+
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
36+
| awk 'sub(":$", "", $1) { print $1 }' \
4537
| sort -u \
4638
| xargs -rt apt-mark manual; \
4739
\
4840
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
49-
rm -rf /var/lib/apt/lists/*
41+
apt-get dist-clean
5042

51-
ARG POSTFIXADMIN_VERSION=3.3.16
52-
ARG POSTFIXADMIN_SHA512=d1b8074c32f7912c187c2c37c5cca158432cb85fc415d9efe86cf11f70ab035117053cc579306e224cb180e70fa3c84a68335f18d62b43abf591e8105a00847d
43+
ARG POSTFIXADMIN_VERSION=4.0.1
44+
ARG POSTFIXADMIN_SHA512=88be6834257580c7a52dce33ce552e1868a1b28ba639a3378a66278939640073af4f8893fbfac690e2df5e67db0143c5726aab575bf0e4014b39a03d46916831
5345

5446
ENV POSTFIXADMIN_VERSION $POSTFIXADMIN_VERSION
5547
ENV POSTFIXADMIN_SHA512 $POSTFIXADMIN_SHA512
5648

5749

5850
RUN set -eu; \
59-
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${POSTFIXADMIN_VERSION}.tar.gz"; \
51+
curl -fsSL -o postfixadmin.tar.gz "https://github.com/postfixadmin/postfixadmin/archive/v${POSTFIXADMIN_VERSION}.tar.gz"; \
6052
echo "$POSTFIXADMIN_SHA512 *postfixadmin.tar.gz" | sha512sum -c -; \
6153
# upstream tarball include ./postfixadmin-postfixadmin-${POSTFIXADMIN_VERSION}/
6254
mkdir /usr/src/postfixadmin; \
@@ -68,5 +60,28 @@ RUN set -eu; \
6860

6961
COPY docker-entrypoint.sh /usr/local/bin/
7062

63+
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
64+
65+
# https://github.com/moby/buildkit/issues/4503
66+
# https://github.com/composer/composer/issues/11839
67+
# https://github.com/composer/composer/blob/94fe2945456df51e122a492b8d14ac4b54c1d2ce/src/Composer/Console/Application.php#L217-L218
68+
ENV COMPOSER_ALLOW_SUPERUSER 1
69+
70+
RUN set -eux; \
71+
composerDeps=" \
72+
unzip \
73+
"; \
74+
apt-get update; \
75+
apt-get install -y --no-install-recommends $composerDeps; \
76+
\
77+
export COMPOSER_HOME="$(mktemp -d)"; \
78+
# mysqli is expected but we use pdo
79+
composer install --ignore-platform-req=ext-mysqli --no-dev --no-interaction --working-dir /usr/src/postfixadmin; \
80+
# delete composer cache
81+
rm -rf "$COMPOSER_HOME"; \
82+
\
83+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $composerDeps; \
84+
apt-get dist-clean
85+
7186
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
7287
CMD ["php-fpm"]

0 commit comments

Comments
 (0)