Skip to content

Commit 07a00c4

Browse files
committed
remove clamav from build since only runtime production images would need it, add comments to clarify why we need to update the default conf
1 parent 04ccf6b commit 07a00c4

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

build/Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,9 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C3173AA6 A
7878
python-dev \
7979
ghostscript \
8080
poppler-utils \
81-
tesseract-ocr \
82-
clamav-daemon \
83-
clamdscan && \
81+
tesseract-ocr && \
8482
rm -rf /usr/share/man/man1 && \
8583
rm -rf /usr/share/man/man7 && \
86-
sed -i 's/^\bLocalSocket\b/#&/g' /etc/clamav/clamd.conf && \
87-
echo "TCPSocket 3310" >> /etc/clamav/clamd.conf && \
88-
echo "TCPAddr 10.21.4.150" >> /etc/clamav/clamd.conf && \
89-
echo "TCPAddr 10.21.5.150" >> /etc/clamav/clamd.conf && \
90-
# adding clamav socket directory to allow clamd to start without using a service
91-
mkdir -p /run/clamav && \
92-
chown clamav /run/clamav && \
93-
\
9484
# Setup Rubygems
9585
echo 'gem: --no-document' > /etc/gemrc && \
9686
gem install bundler && \

ruby/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C3173AA6 &
6767
clamdscan && \
6868
rm -rf /usr/share/man/man1 && \
6969
rm -rf /usr/share/man/man7 && \
70+
# clamav is configured in local mode by default, disabling LocalSocket and adding TCPAddr to move it into networked mode
7071
sed -i 's/^\bLocalSocket\b/#&/g' /etc/clamav/clamd.conf && \
7172
echo "TCPSocket 3310" >> /etc/clamav/clamd.conf && \
7273
echo "TCPAddr 10.21.4.150" >> /etc/clamav/clamd.conf && \

0 commit comments

Comments
 (0)