diff --git a/.github/workflows/datasets.yml b/.github/workflows/datasets.yml index 193d5fa..8aea1ca 100644 --- a/.github/workflows/datasets.yml +++ b/.github/workflows/datasets.yml @@ -11,6 +11,19 @@ jobs: runs-on: ubuntu-latest container: ghcr.io/investigativedata/investigraph-eu:main services: + postgres: + image: postgres:alpine + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - 5432:5432 + env: + POSTGRES_USER: investigraph + POSTGRES_DB: investigraph + POSTGRES_PASSWORD: investigraph redis: image: redis:alpine options: >- @@ -24,6 +37,10 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} FSSPEC_S3_ENDPOINT_URL: ${{ secrets.FSSPEC_S3_ENDPOINT_URL }} + DEBUG: false + REDIS_URL: redis://redis:6379/0 + PREFECT_API_DATABASE_CONNECTION_URL: postgresql+asyncpg://investigraph:investigraph@postgres/investigraph + PREFECT_TASK_RUNNER: dask strategy: matrix: dataset: diff --git a/Dockerfile b/Dockerfile index 78515af..a5cbac1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM ghcr.io/investigativedata/investigraph:develop +FROM ghcr.io/investigativedata/investigraph:main USER root RUN apt install -y curl -RUN pip install lxml html5lib +RUN pip install lxml html5lib psycopg2-binary RUN pip uninstall -y followthemoney RUN pip install "followthemoney @ git+https://github.com/investigativedata/followthemoney.git@schema/science-identifiers" @@ -16,5 +16,3 @@ COPY ./datasets/ec_meetings /data/datasets/ec_meetings RUN investigraph add-block -b local-file-system/datasets -u /data/datasets ENV DATASETS_BLOCK local-file-system/datasets -ENV REDIS_URL=redis://redis:6379/0 -ENV DEBUG=0