Fix issues with Docker image building and update README

This commit is contained in:
ChronosX88 2019-07-17 16:25:10 +04:00
parent 10d514e45b
commit 25c4908fd3
6 changed files with 21 additions and 21 deletions

View File

@ -1,11 +1,11 @@
FROM base/archlinux:latest
FROM archlinux/base:latest
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
ENV LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8
RUN pacman -Syy --noconfirm
RUN pacman -Syu --noconfirm
RUN pacman -S --noconfirm reflector && reflector --verbose -l 200 -p http --sort rate --save /etc/pacman.d/mirrorlist
@ -20,3 +20,7 @@ COPY requirements.txt /tmp/requirements.txt
RUN pip3 install -r /tmp/requirements.txt
ADD docker/confd /etc/confd
COPY ./GeoIPCity.dat /tmp/
RUN mkdir -p /usr/share/GeoIP/ && mv /tmp/GeoIPCity.dat /usr/share/GeoIP/GeoIPCity.dat

BIN
GeoIPCity.dat Normal file

Binary file not shown.

View File

@ -7,7 +7,7 @@ basenc:
docker build -t medved_base . --no-cache
up:
docker-compose up
docker-compose up --scale worker=$(workers)
upd:
docker-compose up -d

View File

@ -1,9 +1,7 @@
# medved
alpha beta whatever
partly works
# Medved
This is extensible network scanner (Masscan-based).
## configuration
## Configuration
`data/config.yaml`
```
@ -140,13 +138,19 @@ logging:
Storage: DEBUG
Loader: DEBUG
```
probably it can be launched with docker, however I didn't test it yet
run `make base && docker-compose up --build --scale worker=5`
## Requirements
* `docker >=18.09`
* `docker-composer >=1.24`
or simply `python medved.py`
## Building Docker image
you'll need working redis and mongodb for default configuration
Run `make base && docker-compose up --build --scale worker=5`
## Running
Run `make up workers=5`
This launches a scanner with 5 workers.
## top-level services

View File

@ -7,10 +7,6 @@ RUN git clone https://github.com/robertdavidgraham/masscan && \
make -j && \
mv bin/masscan /bin/masscan
RUN wget -N http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz && gunzip GeoLiteCity.dat.gz
RUN mkdir -p /usr/share/GeoIP/ && mv GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat
ADD files/torrc /etc/tor/torrc
ADD files/run.sh /tmp/run.sh

View File

@ -7,10 +7,6 @@ RUN git clone https://github.com/robertdavidgraham/masscan && \
make -j && \
mv bin/masscan /usr/bin/masscan
RUN wget -N http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz && gunzip GeoLiteCity.dat.gz
RUN mkdir -p /usr/share/GeoIP/ && mv GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat
ADD files/run.sh /tmp/run.sh
CMD ["/tmp/run.sh"]