From b90dace0ad322cd11500767bfa3d5468c2fe5b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 25 Apr 2022 15:48:07 +0200 Subject: [PATCH] chg: Remove splash from docker stuff --- Dockerfile | 8 +++++++- docker-compose.yml | 10 ---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab036ce..f91be19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ ENV LANG=C.UTF-8 RUN apt-get update RUN apt-get -y upgrade RUN apt-get -y install wget python3-dev git python3-venv python3-pip python-is-python3 +RUN apt-get -y install libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 libxkbcommon0 libxdamage1 libgbm1 libpango-1.0-0 libcairo2 libatspi2.0-0 RUN pip3 install poetry WORKDIR lookyloo @@ -20,7 +21,12 @@ COPY README.md . RUN mkdir cache user_agents scraped -RUN poetry install RUN echo LOOKYLOO_HOME="'`pwd`'" > .env +RUN cp config/generic.json.sample config/generic.json +RUN cp config/modules.json.sample config/modules.json +RUN poetry install +RUN poetry run playwright install +RUN poetry run tools/validate_config_files.py --check +RUN poetry run tools/validate_config_files.py --update RUN poetry run tools/3rdparty.py RUN poetry run tools/generate_sri.py diff --git a/docker-compose.yml b/docker-compose.yml index 1027b15..718b548 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,19 +15,10 @@ services: volumes: - ./indexing:/indexing - splash: - image: "scrapinghub/splash:3.5.0" - ports: - - "8050:8050" - - "5023:5023" - command: --disable-private-mode - lookyloo: build: . working_dir: /lookyloo tty: true - environment: - - SPLASH_URL_DOCKER=http://splash:8050 command: - /bin/sh - -c @@ -46,4 +37,3 @@ services: links: - "redis-cache" - "redis-indexing" - - "splash"