Use the `malware-scanner` data dir.

docker-compose.malware-scanner.yml

@@ -14,8 +14,8 @@ services:
     restart: on-failure
     logging: *default-logging
     volumes:
-      - ./docker/data/clamav/defs:/var/lib/clamav
-      - ./docker/clamav/clamd.conf:/etc/clamav/clamd.conf:ro
+      - ./docker/data/malware-scanner/clamav/defs:/var/lib/clamav
+      - ./docker/malware-scanner/clamd.conf:/etc/clamav/clamd.conf:ro
     expose:
       - 3310 # NEVER expose this outside of the local network!
     deploy:
@@ -38,7 +38,6 @@ services:
     env_file:
       - .env
     environment:
-      - SKYNET_DB_HOST=${SKYNET_DB_HOST}
       - CLAMAV_IP=${CLAMAV_IP:-10.10.10.100}
       - CLAMAV_PORT=${CLAMAV_PORT:-3310}
     expose:

docker/accounts/Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:1.16.7
-LABEL maintainer="NebulousLabs <devs@nebulous.tech>"
+LABEL maintainer="SkynetLabs <devs@siasky.net>"
 
 ENV GOOS linux
 ENV GOARCH amd64

docker/malware-scanner/Dockerfile

@@ -13,10 +13,12 @@ RUN git clone --single-branch --branch ${branch} https://github.com/SkynetLabs/m
     go mod download && \
     make release
 
-ARG SKYNET_DB_HOST=localhost
-ARG SKYNET_DB_PORT=27017
-ARG SKYNET_DB_USER=username
-ARG SKYNET_DB_PASS=password
-ARG MALWARE_SCANNER_PORT=4000
+ENV SKYNET_DB_HOST="localhost"
+ENV SKYNET_DB_PORT="27017"
+ENV SKYNET_DB_USER="username"
+ENV SKYNET_DB_PASS="password"
+ENV MALWARE_SCANNER_PORT=4000
+ENV CLAMAV_IP=127.0.0.1
+ENV CLAMAV_PORT=3310
 
 ENTRYPOINT ["malware-scanner"]