diff --git a/.github/workflows/harvest-restrictions.yaml b/.github/workflows/harvest-restrictions.yaml index f765160..97b44eb 100644 --- a/.github/workflows/harvest-restrictions.yaml +++ b/.github/workflows/harvest-restrictions.yaml @@ -35,7 +35,8 @@ jobs: - uses: actions/checkout@v4 - name: Download sources run: | - python download.py sources.json -v + /venv/bin/python download.py sources.json -v - name: Process overlays run: | + source /venv/bin/activate ./process.sh \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5f5e624..d9e382b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,15 +19,16 @@ RUN apt-get update && \ apt-get -qq install -y --no-install-recommends python3-psycopg2 && \ rm -rf /var/lib/apt/lists/* +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \ + unzip awscliv2.zip && \ + ./aws/install + WORKDIR /home/harvest-restrictions COPY requirements*.txt ./ -RUN python3 -m venv venv && \ - . venv/bin/activate && \ - python -m pip install -U pip && \ - python -m pip install --no-cache-dir --upgrade numpy && \ - python -m pip install -r requirements.txt && \ - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \ - unzip awscliv2.zip && \ - ./aws/install \ No newline at end of file +RUN python3 -m venv /venv && \ + /venv/bin/python -m pip install -U pip && \ + /venv/bin/python -m pip install --no-cache-dir --upgrade numpy && \ + /venv/bin/python -m pip install -r requirements.txt +