diff --git a/docker-compose.malware-scanner.yml b/docker-compose.malware-scanner.yml index 405e6542..09b595c2 100644 --- a/docker-compose.malware-scanner.yml +++ b/docker-compose.malware-scanner.yml @@ -31,25 +31,21 @@ services: context: ./docker/malware-scanner dockerfile: Dockerfile args: - branch: main + branch: tmp container_name: malware-scanner restart: unless-stopped logging: *default-logging env_file: - .env environment: + - SKYNET_DB_HOST=${SKYNET_DB_HOST} - CLAMAV_IP=${CLAMAV_IP:-10.10.10.100} - CLAMAV_PORT=${CLAMAV_PORT:-3310} - - MALWARE_SCANNER_PORT=${MALWARE_SCANNER_PORT:-4000} - - PORTAL_DOMAIN=${PORTAL_DOMAIN} - - SKYNET_DB_HOST=${SKYNET_DB_HOST} - - SKYNET_DB_PORT=${SKYNET_DB_PORT} - - SKYNET_DB_USER=${SKYNET_DB_USER} - - SKYNET_DB_PASS=${SKYNET_DB_PASS} expose: - 4000 networks: shared: ipv4_address: 10.10.10.101 depends_on: + - mongo - clamav diff --git a/docker/malware-scanner/Dockerfile b/docker/malware-scanner/Dockerfile index fa389ddb..c1f45d33 100644 --- a/docker/malware-scanner/Dockerfile +++ b/docker/malware-scanner/Dockerfile @@ -13,10 +13,10 @@ RUN git clone --single-branch --branch ${branch} https://github.com/SkynetLabs/m go mod download && \ make release -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 +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 ENTRYPOINT ["malware-scanner"] diff --git a/docker/clamav/clamd.conf b/docker/malware-scanner/clamd.conf similarity index 100% rename from docker/clamav/clamd.conf rename to docker/malware-scanner/clamd.conf