Skip to content

Commit 2dbe8bf

Browse files
DerLinkmanDerLinkman
authored
Merge pull request #5952 from mailcow/staging
2024-06b
2 parents 70126e1 + ef7ec06 commit 2dbe8bf

File tree

6 files changed

+62
-80
lines changed

6 files changed

+62
-80
lines changed

‎data/Dockerfiles/phpfpm/Dockerfile‎

Lines changed: 50 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2-fpm-alpine3.20
1+
FROM php:8.2-fpm-bookworm
22
LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
33

44
# renovate: datasource=github-tags depName=krakjoe/apcu versioning=semver-coerced extractVersion=^v(?<version>.*)$
@@ -14,54 +14,51 @@ ARG REDIS_PECL_VERSION=6.0.2
1414
# renovate: datasource=github-tags depName=composer/composer versioning=semver-coerced extractVersion=(?<version>.*)$
1515
ARG COMPOSER_VERSION=2.6.6
1616

17-
RUN apk add -U --no-cache autoconf \
18-
aspell-dev \
19-
aspell-libs \
17+
RUN apt-get update && apt-get install --no-install-recommends -y \
18+
aspell \
19+
aspell-en \
20+
autoconf \
2021
bash \
21-
c-client \
22-
cyrus-sasl-dev \
23-
freetype \
24-
freetype-dev \
22+
default-mysql-client \
23+
dnsutils \
2524
g++ \
26-
git \
2725
gettext \
28-
gettext-dev \
29-
gmp-dev \
26+
git \
3027
gnupg \
31-
icu-dev \
32-
icu-libs \
3328
imagemagick \
34-
imagemagick-dev \
35-
imap-dev \
3629
jq \
37-
libavif \
38-
libavif-dev \
39-
libjpeg-turbo \
40-
libjpeg-turbo-dev \
41-
libmemcached \
30+
libc-client-dev \
31+
libc-client2007e \
32+
libfreetype6-dev \
33+
libgettextpo-dev \
34+
libgmp-dev \
35+
libicu-dev \
36+
libjpeg62-turbo-dev \
37+
libkrb5-3 \
38+
libkrb5-dev \
39+
libldap2-dev \
40+
libmagickcore-dev \
41+
libmagickwand-dev \
4242
libmemcached-dev \
43-
libpng \
43+
libmemcached11 \
44+
libpcre3-dev \
4445
libpng-dev \
45-
libressl \
46-
libressl-dev \
47-
librsvg \
48-
libtool \
46+
libpspell-dev \
47+
librsvg2-dev \
48+
libsasl2-dev \
49+
libssl-dev \
4950
libwebp-dev \
5051
libxml2-dev \
51-
libxpm \
5252
libxpm-dev \
53-
libzip \
53+
libxpm4 \
5454
libzip-dev \
55-
linux-headers \
55+
libzip4 \
5656
make \
57-
mysql-client \
58-
openldap-dev \
59-
pcre-dev \
6057
re2c \
61-
redis \
62-
samba-client \
63-
zlib-dev \
58+
redis-tools \
59+
smbclient \
6460
tzdata \
61+
zlib1g-dev \
6562
&& pecl install APCu-${APCU_PECL_VERSION} \
6663
&& pecl install imagick-${IMAGICK_PECL_VERSION} \
6764
&& pecl install mailparse-${MAILPARSE_PECL_VERSION} \
@@ -71,40 +68,37 @@ RUN apk add -U --no-cache autoconf \
7168
&& pecl clear-cache \
7269
&& docker-php-ext-configure intl \
7370
&& docker-php-ext-configure exif \
74-
&& docker-php-ext-configure gd --with-freetype=/usr/include/ \
75-
--with-jpeg=/usr/include/ \
76-
--with-webp \
77-
--with-xpm \
78-
--with-avif \
71+
&& docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm \
7972
&& docker-php-ext-install -j 4 exif gd gettext intl ldap opcache pcntl pdo pdo_mysql pspell soap sockets sysvsem zip bcmath gmp \
80-
&& docker-php-ext-configure imap --with-imap --with-imap-ssl \
81-
&& docker-php-ext-install -j 4 imap \
73+
&& docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos \
74+
&& docker-php-ext-install -j 4 imap \
8275
&& curl --silent --show-error https://getcomposer.org/installer | php -- --version=${COMPOSER_VERSION} \
8376
&& mv composer.phar /usr/local/bin/composer \
8477
&& chmod +x /usr/local/bin/composer \
85-
&& apk del --purge autoconf \
86-
aspell-dev \
87-
cyrus-sasl-dev \
88-
freetype-dev \
78+
&& apt-get purge -y --auto-remove \
79+
autoconf \
8980
g++ \
90-
gettext-dev \
91-
icu-dev \
92-
imagemagick-dev \
93-
imap-dev \
94-
libavif-dev \
95-
libjpeg-turbo-dev \
81+
libc-client-dev \
82+
libfreetype6-dev \
83+
libgettextpo-dev \
84+
libicu-dev \
85+
libjpeg62-turbo-dev \
86+
libkrb5-dev \
87+
libldap2-dev \
88+
libmagickcore-dev \
89+
libmagickwand-dev \
9690
libmemcached-dev \
91+
libpcre3-dev \
9792
libpng-dev \
98-
libressl-dev \
93+
libpspell-dev \
94+
libsasl2-dev \
95+
libssl-dev \
9996
libwebp-dev \
10097
libxml2-dev \
10198
libxpm-dev \
10299
libzip-dev \
103-
linux-headers \
104100
make \
105-
openldap-dev \
106-
pcre-dev \
107-
zlib-dev
101+
zlib1g-dev
108102

109103
COPY ./docker-entrypoint.sh /
110104

‎data/Dockerfiles/phpfpm/docker-entrypoint.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ done
2424
CONTAINER_ID=
2525
until [[ ! -z "${CONTAINER_ID}" ]] && [[ "${CONTAINER_ID}" =~ ^[[:alnum:]]*$ ]]; do
2626
CONTAINER_ID=$(curl --silent --insecure https://dockerapi/containers/json | jq -r ".[] | {name: .Config.Labels[\"com.docker.compose.service\"], project: .Config.Labels[\"com.docker.compose.project\"], id: .Id}" 2> /dev/null | jq -rc "select( .name | tostring | contains(\"mysql-mailcow\")) | select( .project | tostring | contains(\"${COMPOSE_PROJECT_NAME,,}\")) | .id" 2> /dev/null)
27+
echo "Could not get mysql-mailcow container id... trying again"
2728
sleep 2
2829
done
2930
echo "MySQL @ ${CONTAINER_ID}"
@@ -197,10 +198,10 @@ fi
197198
[[ ! -f /web/css/build/0081-custom-mailcow.css ]] && echo '/* Autogenerated by mailcow */' > /web/css/build/0081-custom-mailcow.css
198199

199200
# Fix permissions for global filters
200-
chown -R 82:82 /global_sieve/*
201+
chown -R 33:33 /global_sieve/*
201202

202203
# Fix permissions on twig cache folder
203-
chown -R 82:82 /web/templates/cache
204+
chown -R 33:33 /web/templates/cache
204205
# Clear cache
205206
find /web/templates/cache/* -not -name '.gitkeep' -delete
206207

‎data/conf/postfix/postscreen_access.cidr‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Whitelist generated by Postwhite v3.4 on Sat Jun 1 00:15:02 UTC 2024
1+
# Whitelist generated by Postwhite v3.4 on Mon Jul 1 00:16:55 UTC 2024
22
# https://github.com/stevejenkins/postwhite/
3-
# 2000 total rules
3+
# 1993 total rules
44
2a00:1450:4000::/36 permit
55
2a01:111:f400::/48 permit
66
2a01:111:f403:8000::/50 permit
@@ -23,11 +23,7 @@
2323
8.40.222.0/23 permit
2424
10.162.0.0/16 permit
2525
12.130.86.238 permit
26-
13.70.32.43 permit
2726
13.72.50.45 permit
28-
13.74.143.28 permit
29-
13.78.233.182 permit
30-
13.92.31.129 permit
3127
13.110.208.0/21 permit
3228
13.110.209.0/24 permit
3329
13.110.216.0/22 permit
@@ -110,6 +106,7 @@
110106
35.176.132.251 permit
111107
35.190.247.0/24 permit
112108
35.191.0.0/16 permit
109+
35.205.92.9 permit
113110
35.242.169.159 permit
114111
37.218.248.47 permit
115112
37.218.249.47 permit
@@ -185,8 +182,6 @@
185182
50.18.126.162 permit
186183
50.31.32.0/19 permit
187184
50.56.130.220/30 permit
188-
51.137.58.21 permit
189-
51.140.75.55 permit
190185
52.1.14.157 permit
191186
52.5.230.59 permit
192187
52.27.5.72 permit
@@ -216,7 +211,6 @@
216211
52.100.0.0/14 permit
217212
52.103.0.0/17 permit
218213
52.119.213.144/28 permit
219-
52.165.175.144 permit
220214
52.185.106.240/28 permit
221215
52.200.59.0/24 permit
222216
52.205.61.79 permit
@@ -1142,7 +1136,6 @@
11421136
104.47.108.0/23 permit
11431137
104.130.96.0/28 permit
11441138
104.130.122.0/23 permit
1145-
104.214.25.77 permit
11461139
106.10.144.64/27 permit
11471140
106.10.144.100/31 permit
11481141
106.10.144.103 permit
@@ -1373,6 +1366,7 @@
13731366
136.147.176.0/20 permit
13741367
136.147.176.0/24 permit
13751368
136.147.182.0/24 permit
1369+
136.147.224.0/20 permit
13761370
136.179.50.206 permit
13771371
138.91.172.26 permit
13781372
139.60.152.0/22 permit
@@ -1435,7 +1429,6 @@
14351429
157.55.61.0/24 permit
14361430
157.55.157.128/25 permit
14371431
157.55.225.0/25 permit
1438-
157.55.254.216 permit
14391432
157.56.24.0/25 permit
14401433
157.56.120.128/26 permit
14411434
157.56.232.0/21 permit
@@ -1753,6 +1746,7 @@
17531746
205.251.233.36 permit
17541747
206.25.247.143 permit
17551748
206.25.247.155 permit
1749+
206.55.144.0/20 permit
17561750
206.165.246.80/29 permit
17571751
206.191.224.0/19 permit
17581752
206.246.157.1 permit
@@ -1770,7 +1764,6 @@
17701764
207.46.132.128/27 permit
17711765
207.46.198.0/25 permit
17721766
207.46.200.0/27 permit
1773-
207.46.225.107 permit
17741767
207.58.147.64/28 permit
17751768
207.67.38.0/24 permit
17761769
207.67.98.192/27 permit

‎data/web/js/site/debug.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,13 +1294,7 @@ function update_stats(timeout=5){
12941294
$("#host_cpu_usage").text(parseInt(data.cpu.usage).toString() + "%");
12951295
$("#host_memory_total").text((data.memory.total / (1024 ** 3)).toFixed(2).toString() + "GB");
12961296
$("#host_memory_usage").text(parseInt(data.memory.usage).toString() + "%");
1297-
if (data.architecture == "aarch64"){
1298-
$("#host_architecture").html('<span data-bs-toggle="tooltip" data-bs-placement="top" title="' + lang_debug.wip +'">' + data.architecture + ' ⚠️</span>');
1299-
}
1300-
else {
1301-
$("#host_architecture").html(data.architecture);
1302-
}
1303-
1297+
$("#host_architecture").html(data.architecture);
13041298
// update cpu and mem chart
13051299
var cpu_chart = Chart.getChart("host_cpu_chart");
13061300
var mem_chart = Chart.getChart("host_mem_chart");

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
- rspamd
111111

112112
php-fpm-mailcow:
113-
image: mailcow/phpfpm:1.88
113+
image: mailcow/phpfpm:1.89
114114
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
115115
depends_on:
116116
- redis-mailcow

‎helper-scripts/backup_and_restore.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ ENV_FILE=${SCRIPT_DIR}/../.env
5555
THREADS=$(echo ${THREADS:-1})
5656
ARCH=$(uname -m)
5757

58-
if ! [[ "${THREADS}" =~ ^[1-9]+$ ]] ; then
58+
if ! [[ "${THREADS}" =~ ^[1-9][0-9]?$ ]] ; then
5959
echo "Thread input is not a number!"
6060
exit 1
61-
elif [[ "${THREADS}" =~ ^[1-9]+$ ]] ; then
61+
elif [[ "${THREADS}" =~ ^[1-9][0-9]?$ ]] ; then
6262
echo "Using ${THREADS} Thread(s) for this run."
6363
echo "Notice: You can set the Thread count with the THREADS Variable before you run this script."
6464
fi

0 commit comments

Comments
 (0)