CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #390 from kimmoal/docker-fixes 

Fixes in docker-compose deployment
pull/391/head
Raphaël Vinot 2022-04-10 12:28:06 +02:00 committed by GitHub
parent 59b1112aff a80b6a31e4
commit b7ee3a7ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -23,3 +23,4 @@ RUN mkdir cache user_agents scraped
RUN poetry install RUN poetry install
RUN echo LOOKYLOO_HOME="'`pwd`'" > .env RUN echo LOOKYLOO_HOME="'`pwd`'" > .env
RUN poetry run tools/3rdparty.py RUN poetry run tools/3rdparty.py
RUN poetry run tools/generate_sri.py

3
bin/background_indexer.py
View File

@ -3,6 +3,7 @@
import logging import logging
import os import os
from datetime import datetime, timedelta from datetime import datetime, timedelta
import shutil
from lookyloo.default import AbstractManager from lookyloo.default import AbstractManager
from lookyloo.exceptions import MissingUUID, NoValidHarFile from lookyloo.exceptions import MissingUUID, NoValidHarFile
@ -61,7 +62,7 @@ class BackgroundIndexer(AbstractManager):
self.logger.warning(f'Unable to build pickle for {uuid}: {uuid_path.parent.name}') self.logger.warning(f'Unable to build pickle for {uuid}: {uuid_path.parent.name}')
# The capture is not working, moving it away. # The capture is not working, moving it away.
self.lookyloo.redis.hdel('lookup_dirs', uuid) self.lookyloo.redis.hdel('lookup_dirs', uuid)
uuid_path.parent.rename(self.discarded_captures_dir / uuid_path.parent.name) shutil.move(uuid_path.parent, (self.discarded_captures_dir / uuid_path.parent.name))
def _check_indexes(self): def _check_indexes(self):
index_redis = self.lookyloo.indexing.redis index_redis = self.lookyloo.indexing.redis

1
docker-compose.yml
View File

@ -38,6 +38,7 @@ services:
- ./cache:/lookyloo/cache - ./cache:/lookyloo/cache
- ./indexing:/lookyloo/indexing - ./indexing:/lookyloo/indexing
- ./scraped:/lookyloo/scraped - ./scraped:/lookyloo/scraped
- ./discarded:/lookyloo/discarded_captures
- ./user_agents:/lookyloo/user_agents - ./user_agents:/lookyloo/user_agents
- ./config:/lookyloo/config - ./config:/lookyloo/config
ports: ports: