diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 6c591cff..37a7ae43 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -45,6 +45,14 @@ jobs: with: python-version: 3.11 + - name: Cache pip packages + uses: actions/cache@v4 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/test-container-build.yml b/.github/workflows/test-container-build.yml index 48838e82..7b3f3772 100644 --- a/.github/workflows/test-container-build.yml +++ b/.github/workflows/test-container-build.yml @@ -50,6 +50,14 @@ jobs: with: python-version: 3.11 + - name: Cache pip packages + uses: actions/cache@v4 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + # Just test that the build works, some libraries won't compile on ARM/rPi etc - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/test-stack-reusable-workflow.yml b/.github/workflows/test-stack-reusable-workflow.yml index a48e3c91..076f1aaa 100644 --- a/.github/workflows/test-stack-reusable-workflow.yml +++ b/.github/workflows/test-stack-reusable-workflow.yml @@ -28,6 +28,15 @@ jobs: with: python-version: ${{ env.PYTHON_VERSION }} + - name: Cache pip packages + uses: actions/cache@v4 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-py${{ env.PYTHON_VERSION }}-${{ hashFiles('requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip-py${{ env.PYTHON_VERSION }}- + ${{ runner.os }}-pip- + - name: Build changedetection.io container for testing under Python ${{ env.PYTHON_VERSION }} run: | echo "---- Building for Python ${{ env.PYTHON_VERSION }} -----" diff --git a/Dockerfile b/Dockerfile index 3abf0bbc..bdc22907 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,7 @@ ENV OPENSSL_INCLUDE_DIR="/usr/include/openssl" ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 RUN --mount=type=cache,target=/tmp/pip-cache \ pip install \ + --prefer-binary \ --extra-index-url https://www.piwheels.org/simple \ --extra-index-url https://pypi.anaconda.org/ARM-software/simple \ --cache-dir=/tmp/pip-cache \ @@ -47,6 +48,7 @@ RUN --mount=type=cache,target=/tmp/pip-cache \ # https://github.com/dgtlmoon/changedetection.io/pull/1067 also musl/alpine (not supported) RUN --mount=type=cache,target=/tmp/pip-cache \ pip install \ + --prefer-binary \ --cache-dir=/tmp/pip-cache \ --target=/dependencies \ playwright~=1.48.0 \ diff --git a/changedetectionio/run_proxy_tests.sh b/changedetectionio/run_proxy_tests.sh index b76cf221..206a37a3 100755 --- a/changedetectionio/run_proxy_tests.sh +++ b/changedetectionio/run_proxy_tests.sh @@ -31,6 +31,9 @@ echo "----------------- SQUID PROXY ONE LOGS -------------" docker logs squid-one echo "----------------- SQUID PROXY TWO LOGS -------------" docker logs squid-two +echo "----- squid-two cat /var/log/squid/access.log --------" +docker exec squid-two cat /var/log/squid/access.log +docker exec squid-two ls -al /var/log/squid echo "------------------------------------------------------" set +e