public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[SOGo] Do not modify UIxAclEditor
bd469412
data/Dockerfiles/rspamd/Dockerfile | 28 ++++++++++++++++------------
data/Dockerfiles/sogo/bootstrap-sogo.sh | 22 +++++++++++-----------
2 files changed, 27 insertions(+), 23 deletions(-)Diff
diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 143c7f82..58cd1ac5 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -1,22 +1,26 @@
-FROM ubuntu:bionic
+FROM debian:buster-slim
LABEL maintainer "Andre Peters <[email protected]>"
ARG DEBIAN_FRONTEND=noninteractive
+ARG CODENAME=buster
ENV LC_ALL C
RUN apt-get update && apt-get install -y \
tzdata \
- ca-certificates \
- gnupg2 \
- apt-transport-https \
- && apt-key adv --fetch-keys https://rspamd.com/apt/gpg.key \
- && echo "deb https://rspamd.com/apt-stable/ bionic main" > /etc/apt/sources.list.d/rspamd.list \
- && apt-get update && apt-get install -y rspamd dnsutils \
- && rm -rf /var/lib/apt/lists/* \
- && apt-get autoremove --purge \
- && apt-get clean \
- && mkdir -p /run/rspamd \
- && chown _rspamd:_rspamd /run/rspamd
+ ca-certificates \
+ gnupg2 \
+ apt-transport-https \
+ dnsutils \
+ && apt-key adv --fetch-keys https://rspamd.com/apt-stable/gpg.key \
+ && echo "deb [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list \
+ && echo "deb-src [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" >> /etc/apt/sources.list.d/rspamd.list \
+ && apt-get update \
+ && apt-get --no-install-recommends -y install rspamd \
+ && rm -rf /var/lib/apt/lists/* \
+ && apt-get autoremove --purge \
+ && apt-get clean \
+ && mkdir -p /run/rspamd \
+ && chown _rspamd:_rspamd /run/rspamd
COPY settings.conf /etc/rspamd/settings.conf
COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/data/Dockerfiles/sogo/bootstrap-sogo.sh b/data/Dockerfiles/sogo/bootstrap-sogo.sh
index 6b7802ea..416286f1 100755
--- a/data/Dockerfiles/sogo/bootstrap-sogo.sh
+++ b/data/Dockerfiles/sogo/bootstrap-sogo.sh
@@ -181,17 +181,17 @@ chown sogo:sogo -R /var/lib/sogo/
chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
# Patch ACLs
-if [[ ${ACL_ANYONE} == 'allow' ]]; then
- #enable any or authenticated targets for ACL
- if patch -R -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
- patch -R /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;
- fi
-else
- #disable any or authenticated targets for ACL
- if patch -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
- patch /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;
- fi
-fi
+#if [[ ${ACL_ANYONE} == 'allow' ]]; then
+# #enable any or authenticated targets for ACL
+# if patch -R -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
+# patch -R /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;
+# fi
+#else
+# #disable any or authenticated targets for ACL
+# if patch -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
+# patch /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;
+# fi
+#fi
# Copy logo, if any
[[ -f /etc/sogo/sogo-full.svg ]] && cp /etc/sogo/sogo-full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg