Docker: use latest python and debian (#7242)

* docker: use latest python and debian

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
Maximilian Hils 2024-10-13 18:21:57 +02:00 committed by GitHub
parent 489dd77dbe
commit 99aa0a70af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions

View File

@ -7,6 +7,8 @@
## Unreleased: mitmproxy next ## Unreleased: mitmproxy next
- Docker: Update image to Python 3.13 on Debian Bookworm.
([#7242](https://github.com/mitmproxy/mitmproxy/pull/7242), @mhils)
- Tighten HTTP detection heuristic to better support custom TCP-based protocols. - Tighten HTTP detection heuristic to better support custom TCP-based protocols.
([#7228](https://github.com/mitmproxy/mitmproxy/pull/7228), @fatanugraha) ([#7228](https://github.com/mitmproxy/mitmproxy/pull/7228), @fatanugraha)

View File

@ -1,9 +1,9 @@
FROM python:3.11-bullseye AS wheelbuilder FROM python:3.13-bookworm AS wheelbuilder
COPY mitmproxy-*-py3-none-any.whl /wheels/ COPY mitmproxy-*-py3-none-any.whl /wheels/
RUN pip install wheel && pip wheel --wheel-dir /wheels /wheels/*.whl RUN pip install wheel && pip wheel --wheel-dir /wheels /wheels/*.whl
FROM python:3.11-slim-bullseye FROM python:3.13-slim-bookworm
RUN useradd -mU mitmproxy RUN useradd -mU mitmproxy
RUN apt-get update \ RUN apt-get update \

View File

@ -15,7 +15,8 @@ fi
usermod -o \ usermod -o \
-u $(stat -c "%u" "$f") \ -u $(stat -c "%u" "$f") \
-g $(stat -c "%g" "$f") \ -g $(stat -c "%g" "$f") \
mitmproxy mitmproxy \
>/dev/null # hide "usermod: no changes"
if [[ "$1" = "mitmdump" || "$1" = "mitmproxy" || "$1" = "mitmweb" ]]; then if [[ "$1" = "mitmdump" || "$1" = "mitmproxy" || "$1" = "mitmweb" ]]; then
exec gosu mitmproxy "$@" exec gosu mitmproxy "$@"