Fetch Staging from orig Repo (#3)
* [Web] add github version tag * [Web] add github version tag * [Web] add github version tag * [Web] add github version tag * [Web] add github version tag * [Web] add github version tag error handling * [Web] add github version tag error handling * Passwordless SOGo auth: support for calendar invitations and calendar/contacts subscriptions Inviting someone to a calendar event triggers a request to /SOGo/so/otheruser@example.com/freebusy.ifb/ajaxRead. Subscribing to someone's calendar/contacts triggers a request to /SOGo/so/otheruser@example.com/foldersSearch. The email address in the URL is different from the logged-in user, which needs to be handled appropriately by sogo-auth.php. * [Web] add github version tag - adjust css * [Compose] Update SOGo Autoreply Schedule to 5m Based on the advice of inverse (SOGo developer). Thanks to https://github.com/jmber Closes: https://github.com/mailcow/mailcow-dockerized/issues/4436 * [Web] add github version tag - move twig globals * [Web] add github version tag - missing </div> * Passwordless SOGo auth: improvements for when accessing other users * [WebAuthn] fido2 passwordless auth - fix (#4440) * [WebAuthn] fido2 revert * [WebAuthn] set UV flags to 'discouraged' * [WebAuthn] revert - set UV flags to 'discouraged' * Update clamav to 0.104.2 * Update clamav to 0.104.2 * Update dovecot to 2.3.18 Update gosu to 1.14 Use debian bullseye as base * [Web] Updated lang.es.json [CI SKIP] (#4453) Co-authored-by: Fijxu <fijxu@zzls.xyz> Co-authored-by: milkmaker <milkmaker@mailcow.de> Co-authored-by: Fijxu <fijxu@zzls.xyz> Co-authored-by: FreddleSpl0it <patschul@posteo.de> Co-authored-by: FreddleSpl0it <75116288+FreddleSpl0it@users.noreply.github.com> Co-authored-by: Michael Kuron <mkuron@users.noreply.github.com> Co-authored-by: Peter <magic@kthx.at> Co-authored-by: milkmaker <milkmaker@mailcow.de> Co-authored-by: Fijxu <fijxu@zzls.xyz>
This commit is contained in:
parent
db73f83c4e
commit
d86e9a22f4
|
@ -2,18 +2,26 @@ FROM debian:bullseye-slim
|
||||||
|
|
||||||
LABEL maintainer "André Peters <andre.peters@servercow.de>"
|
LABEL maintainer "André Peters <andre.peters@servercow.de>"
|
||||||
|
|
||||||
ARG CLAMAV=0.103.5
|
ARG CLAMAV=0.104.2
|
||||||
|
ARG TINI_VERSION=v0.19.0
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
zlib1g-dev \
|
|
||||||
libcurl4-openssl-dev \
|
|
||||||
libncurses5-dev \
|
|
||||||
libzip-dev \
|
|
||||||
libpcre2-dev \
|
|
||||||
libxml2-dev \
|
|
||||||
libssl-dev \
|
|
||||||
build-essential \
|
build-essential \
|
||||||
|
pkg-config \
|
||||||
|
python3 \
|
||||||
|
python3-pip \
|
||||||
|
valgrind \
|
||||||
|
check \
|
||||||
|
libbz2-dev \
|
||||||
|
libcurl4-openssl-dev \
|
||||||
libjson-c-dev \
|
libjson-c-dev \
|
||||||
|
libmilter-dev \
|
||||||
|
libncurses5-dev \
|
||||||
|
libpcre2-dev \
|
||||||
|
libssl-dev \
|
||||||
|
libxml2-dev \
|
||||||
|
zlib1g-dev \
|
||||||
curl \
|
curl \
|
||||||
bash \
|
bash \
|
||||||
wget \
|
wget \
|
||||||
|
@ -22,39 +30,47 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
rsync \
|
rsync \
|
||||||
dos2unix \
|
dos2unix \
|
||||||
netcat \
|
netcat \
|
||||||
|
&& python3 -m pip install cmake \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& wget -O - https://www.clamav.net/downloads/production/clamav-${CLAMAV}.tar.gz | tar xfvz - \
|
&& wget -O - https://www.clamav.net/downloads/production/clamav-${CLAMAV}.tar.gz | tar xfvz - \
|
||||||
&& cd clamav-${CLAMAV} \
|
&& cd clamav-${CLAMAV} \
|
||||||
&& ./configure \
|
&& cmake . \
|
||||||
--prefix=/usr \
|
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||||
--libdir=/usr/lib \
|
-D CMAKE_INSTALL_LIBDIR=/usr/lib \
|
||||||
--sysconfdir=/etc/clamav \
|
-D APP_CONFIG_DIRECTORY=/etc/clamav \
|
||||||
--mandir=/usr/share/man \
|
-D CMAKE_INSTALL_MANDIR=/usr/share/man \
|
||||||
--infodir=/usr/share/info \
|
-D CMAKE_INSTALL_INFODIR=/usr/share/info \
|
||||||
--disable-llvm \
|
-D CLAMAV_USER=clamav \
|
||||||
--with-user=clamav \
|
-D CLAMAV_GROUP=clamav \
|
||||||
--with-group=clamav \
|
-D DATABASE_DIRECTORY=/var/lib/clamav \
|
||||||
--with-dbdir=/var/lib/clamav \
|
-D ENABLE_APP=ON \
|
||||||
--enable-clamdtop \
|
-D ENABLE_JSON_SHARED=OFF \
|
||||||
--enable-bigstack \
|
-D CMAKE_BUILD_TYPE=MinSizeRel \
|
||||||
--with-pcre \
|
&& cmake --build . -j4 \
|
||||||
&& make -j4 \
|
&& cmake --build . --target install \
|
||||||
&& make install \
|
|
||||||
&& make clean \
|
|
||||||
&& cd .. && rm -rf clamav-${CLAMAV} \
|
&& cd .. && rm -rf clamav-${CLAMAV} \
|
||||||
&& apt-get -y --auto-remove purge build-essential \
|
&& apt-get -y --auto-remove purge build-essential \
|
||||||
&& apt-get -y purge zlib1g-dev \
|
&& apt-get -y purge pkg-config \
|
||||||
libncurses5-dev \
|
python3 \
|
||||||
libzip-dev \
|
python3-pip \
|
||||||
libpcre2-dev \
|
valgrind \
|
||||||
libxml2-dev \
|
check \
|
||||||
libssl-dev \
|
libbz2-dev \
|
||||||
|
libcurl4-openssl-dev \
|
||||||
libjson-c-dev \
|
libjson-c-dev \
|
||||||
|
libmilter-dev \
|
||||||
|
libncurses5-dev \
|
||||||
|
libpcre2-dev \
|
||||||
|
libssl-dev \
|
||||||
|
libxml2-dev \
|
||||||
|
zlib1g-dev \
|
||||||
|
|
||||||
&& addgroup --system --gid 700 clamav \
|
&& addgroup --system --gid 700 clamav \
|
||||||
&& adduser --system --no-create-home --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
|
&& adduser --system --no-create-home --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
|
||||||
&& rm -rf /tmp/* /var/tmp/*
|
&& rm -rf /tmp/* /var/tmp/*
|
||||||
|
|
||||||
COPY clamd.sh ./
|
COPY clamd.sh ./
|
||||||
COPY tini /sbin/tini
|
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
|
||||||
|
RUN chmod +x /sbin/tini
|
||||||
|
|
||||||
CMD ["/sbin/tini", "-g", "--", "/clamd.sh"]
|
CMD ["/sbin/tini", "-g", "--", "/clamd.sh"]
|
||||||
|
|
Binary file not shown.
|
@ -2,7 +2,7 @@ FROM debian:bullseye-slim
|
||||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
ARG DOVECOT=2.3.17.1
|
ARG DOVECOT=2.3.18
|
||||||
ENV LC_ALL C
|
ENV LC_ALL C
|
||||||
ENV GOSU_VERSION 1.14
|
ENV GOSU_VERSION 1.14
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,8 @@
|
||||||
"spam_score": "Puntuación de spam",
|
"spam_score": "Puntuación de spam",
|
||||||
"syncjobs": "Trabajos de sincronización",
|
"syncjobs": "Trabajos de sincronización",
|
||||||
"tls_policy": "Póliza de TLS",
|
"tls_policy": "Póliza de TLS",
|
||||||
"unlimited_quota": "Cuota ilimitada para buzones"
|
"unlimited_quota": "Cuota ilimitada para buzones",
|
||||||
|
"app_passwds": "Gestionar las contraseñas de aplicaciones"
|
||||||
},
|
},
|
||||||
"add": {
|
"add": {
|
||||||
"activate_filter_warn": "Todos los demás filtros se desactivarán cuando este filtro se active.",
|
"activate_filter_warn": "Todos los demás filtros se desactivarán cuando este filtro se active.",
|
||||||
|
|
|
@ -58,7 +58,7 @@ services:
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
clamd-mailcow:
|
clamd-mailcow:
|
||||||
image: mailcow/clamd:1.43
|
image: mailcow/clamd:1.44
|
||||||
restart: always
|
restart: always
|
||||||
dns:
|
dns:
|
||||||
- ${IPV4_NETWORK:-172.22.1}.254
|
- ${IPV4_NETWORK:-172.22.1}.254
|
||||||
|
@ -212,7 +212,7 @@ services:
|
||||||
- sogo
|
- sogo
|
||||||
|
|
||||||
dovecot-mailcow:
|
dovecot-mailcow:
|
||||||
image: mailcow/dovecot:1.159
|
image: mailcow/dovecot:1.160
|
||||||
depends_on:
|
depends_on:
|
||||||
- mysql-mailcow
|
- mysql-mailcow
|
||||||
dns:
|
dns:
|
||||||
|
|
Loading…
Reference in New Issue