diff --git a/Dockerfile b/Dockerfile index 9344f903..698d920f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,21 +8,21 @@ RUN apt-get update -y \ libffi-dev \ && rm -rf /var/lib/apt/lists/* -RUN pip install --break-system-packages "poetry==1.5.1" +RUN pip install --break-system-packages "poetry==1.7.1" RUN cd /tmp/dnsrobocert \ && poetry export --format constraints.txt --without-hashes > /tmp/dnsrobocert/constraints.txt \ && poetry build -f wheel -FROM docker.io/python:3.9.13-slim +FROM docker.io/python:3.11.4-slim COPY --from=constraints /tmp/dnsrobocert/constraints.txt /tmp/dnsrobocert/dist/*.whl /tmp/dnsrobocert/ ENV CONFIG_PATH /etc/dnsrobocert/config.yml ENV CERTS_PATH /etc/letsencrypt -# Pin cryptography on armv7l arch to latest available and compatible version from pipwheels: 39.0.2 -RUN [ "$(uname -m)" = "armv7l" ] && sed -i 's/cryptography==.*/cryptography==39.0.2/' /tmp/dnsrobocert/constraints.txt || true +# Pin cryptography on armv7l arch to latest available and compatible version from pipwheels: 41.0.5 +RUN [ "$(uname -m)" = "armv7l" ] && sed -i 's/cryptography==.*/cryptography==41.0.5/' /tmp/dnsrobocert/constraints.txt || true RUN apt-get update -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/poetry.lock b/poetry.lock index 1c3eb954..8aea2e96 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "acme" @@ -2180,20 +2180,6 @@ files = [ [package.dependencies] types-urllib3 = "*" -[[package]] -name = "types-requests" -version = "2.31.0.10" -description = "Typing stubs for requests" -optional = false -python-versions = ">=3.7" -files = [ - {file = "types-requests-2.31.0.10.tar.gz", hash = "sha256:dc5852a76f1eaf60eafa81a2e50aefa3d1f015c34cf0cba130930866b1b22a92"}, - {file = "types_requests-2.31.0.10-py3-none-any.whl", hash = "sha256:b32b9a86beffa876c0c3ac99a4cd3b8b51e973fb8e3bd4e0a6bb32c7efad80fc"}, -] - -[package.dependencies] -urllib3 = ">=2" - [[package]] name = "types-setuptools" version = "68.2.0.1" @@ -2243,23 +2229,6 @@ brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotl secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] -[[package]] -name = "urllib3" -version = "2.0.7" -description = "HTTP library with thread-safe connection pooling, file post, and more." -optional = false -python-versions = ">=3.7" -files = [ - {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"}, - {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"}, -] - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] -secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] -socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] -zstd = ["zstandard (>=0.18.0)"] - [[package]] name = "virtualenv" version = "20.24.6" @@ -2347,4 +2316,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "0e4a786c6bda71340de7d536cbc951a4019552b843f2f35636bb88e1233c377f" +content-hash = "4d26565df774bbae21d24ecf31ff054ea9a6563aaaa847f7d74c320c58cf6968" diff --git a/pyproject.toml b/pyproject.toml index cd7c13c1..d5653c69 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,6 +43,8 @@ acme = "^2" certbot = "^2" dns-lexicon = { version = "^3.14.0", extras = [ "full" ] } importlib-resources = "^6" +# Workaround for: https://github.com/python-poetry/poetry-plugin-export/issues/183 +urllib3 = ">=1.25.4,<1.27" # Optional deps on dns-lexicon zeep = "*" xmltodict = "*"