diff --git a/Dockerfile b/Dockerfile index 585324fa..2e38b410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # pip dependencies install stage -FROM python:3.8-slim as builder +FROM python:3.10-slim as builder # See `cryptography` pin comment in requirements.txt ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1 @@ -29,23 +29,16 @@ RUN pip install --target=/dependencies playwright~=1.27.1 \ || echo "WARN: Failed to install Playwright. The application can still run, but the Playwright option will be disabled." # Final image stage -FROM python:3.8-slim +FROM python:3.10-slim -# See `cryptography` pin comment in requirements.txt -ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1 - -# Re #93, #73, excluding rustc (adds another 430Mb~) RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - gcc \ + libssl1.1 \ + libxslt1.1 \ # For pdftohtml poppler-utils \ - libc-dev \ - libffi-dev \ - libjpeg-dev \ - libssl-dev \ - libxslt-dev \ - zlib1g-dev + zlib1g \ + && apt-get clean && rm -rf /var/lib/apt/lists/* + # https://stackoverflow.com/questions/58701233/docker-logs-erroneously-appears-empty-until-container-stops ENV PYTHONUNBUFFERED=1 diff --git a/changedetectionio/dev-docker/Dockerfile b/changedetectionio/dev-docker/Dockerfile deleted file mode 100644 index f16eac91..00000000 --- a/changedetectionio/dev-docker/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM python:3.8-slim - -# https://stackoverflow.com/questions/58701233/docker-logs-erroneously-appears-empty-until-container-stops -ENV PYTHONUNBUFFERED=1 - -WORKDIR /app - -RUN [ ! -d "/datastore" ] && mkdir /datastore - -COPY sleep.py / -CMD [ "python", "/sleep.py" ] - - - diff --git a/changedetectionio/dev-docker/sleep.py b/changedetectionio/dev-docker/sleep.py deleted file mode 100644 index 27c632b5..00000000 --- a/changedetectionio/dev-docker/sleep.py +++ /dev/null @@ -1,7 +0,0 @@ -import time - -print ("Sleep loop, you should run your script from the console") - -while True: - # Wait for 5 seconds - time.sleep(2)