From b0130c153ca99e3572361cf79ab1ac5bcd9b7375 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 10 Jan 2019 22:13:47 +0100
Subject: [PATCH] [Clamd] Improve logging [Compose] Remove tty from
 clamd-mailcow

---
 data/Dockerfiles/clamd/Dockerfile   | 1 -
 data/Dockerfiles/clamd/bootstrap.sh | 7 -------
 docker-compose.yml                  | 1 -
 3 files changed, 9 deletions(-)

diff --git a/data/Dockerfiles/clamd/Dockerfile b/data/Dockerfiles/clamd/Dockerfile
index 5162cdbb..69e7307c 100644
--- a/data/Dockerfiles/clamd/Dockerfile
+++ b/data/Dockerfiles/clamd/Dockerfile
@@ -32,7 +32,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   --sysconfdir=/etc/clamav \
   --mandir=/usr/share/man \
   --infodir=/usr/share/info \
-  --without-iconv \
   --disable-llvm \
   --with-user=clamav \
   --with-group=clamav \
diff --git a/data/Dockerfiles/clamd/bootstrap.sh b/data/Dockerfiles/clamd/bootstrap.sh
index a8239650..29ffad9a 100755
--- a/data/Dockerfiles/clamd/bootstrap.sh
+++ b/data/Dockerfiles/clamd/bootstrap.sh
@@ -6,13 +6,6 @@ if [[ "${SKIP_CLAMD}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
   exit 0
 fi
 
-# Prepare log pipes
-mkdir -p /var/log/clamav
-touch /var/log/clamav/clamd.log /var/log/clamav/freshclam.log
-chown -R clamav:clamav /var/log/clamav/
-adduser clamav tty
-chmod g+rw /dev/console
-
 # Prepare whitelist
 if [[ -s /etc/clamav/whitelist.ign2 ]]; then
   cp /etc/clamav/whitelist.ign2 /var/lib/clamav/whitelist.ign2
diff --git a/docker-compose.yml b/docker-compose.yml
index a3eb961e..00a9d497 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,6 @@ services:
       image: mailcow/clamd:1.16
       build: ./data/Dockerfiles/clamd
       restart: always
-      tty: true
       environment:
         - TZ=${TZ}
         - SKIP_CLAMD=${SKIP_CLAMD:-n}