Skip to content

Commit 0116ad1

Browse files
Copilotlowtorola
andauthored
Update ClamAV in titan to LTS version 1.0 (#981)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: lowtorola <44183219+lowtorola@users.noreply.github.com>
1 parent 44115d0 commit 0116ad1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

titan/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY . .
1010
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /titan -ldflags="-s -w" ./cmd/titan/main.go
1111

1212

13-
FROM clamav/clamav:0.105.1_base
13+
FROM clamav/clamav:1.0_base
1414

1515
ENV APP_HOME /app
1616
WORKDIR $APP_HOME

titan/bootstrap.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ sed -i 's/\/tmp\/clamd\.sock/\/run\/clamav\/clamd\.sock/' /etc/clamav/clamd.conf
1010
# We need to start the clamd daemon, and conveniently the image provides an init script
1111
# to do this. Less conveniently, that init script also ends with a blocking command to
1212
# "wait forever". So, let's drop that command and run everything else...
13+
# The new ClamAV 1.0 image uses 'exec tail -f "/dev/null"' at the end. Also, the script
14+
# uses tini in the shebang, so we need to change it to /bin/sh when piping.
1315

14-
grep -v 'tail -f "/dev/null"' /init | sh
16+
sed -e 's|^#!/sbin/tini /bin/sh|#!/bin/sh|' -e '/exec tail -f.*\/dev\/null/d' -e '/tail -f.*\/dev\/null/d' /init | sh
1517
# Mischief managed. I am a terrible person.
1618

1719
# Run the Titan server process.

0 commit comments

Comments
 (0)