From 39854e1d799e198c393d3721e8b75602f72554b0 Mon Sep 17 00:00:00 2001 From: Abhinav Singh <126065+abhinavsingh@users.noreply.github.com> Date: Sat, 10 Aug 2024 10:28:53 +0530 Subject: [PATCH] Use Python 3.12 as default Docker base image (#1445) * Use Python 3.12 as default Docker base image * Add standard OCI labels --- Dockerfile | 14 ++++++++------ DockerfileBase | 16 +++++++++------- README.md | 2 +- setup.cfg | 1 + 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63306654..5be77ec8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,19 @@ FROM ghcr.io/abhinavsingh/proxy.py:base as builder -LABEL com.abhinavsingh.name="abhinavsingh/proxy.py" \ - org.opencontainers.image.title="proxy.py" \ - org.opencontainers.image.description="⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • \ +LABEL org.opencontainers.image.title="proxy.py" \ + org.opencontainers.image.description="💫 Ngrok FRP Alternative • ⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • \ 😈 TLS interception • 🔒 DNS-over-HTTPS • 🔥 Poor Man's VPN • ⏪ Reverse & ⏩ Forward • \ 👮🏿 \"Proxy Server\" framework • 🌐 \"Web Server\" framework • ➵ ➶ ➷ ➠ \"PubSub\" framework • \ 👷 \"Work\" acceptor & executor framework" \ - org.opencontainers.url="https://github.com/abhinavsingh/proxy.py" \ + org.opencontainers.image.url="https://github.com/abhinavsingh/proxy.py" \ org.opencontainers.image.source="https://github.com/abhinavsingh/proxy.py" \ - com.abhinavsingh.docker.cmd="docker run -it --rm -p 8899:8899 abhinavsingh/proxy.py" \ org.opencontainers.image.licenses="BSD-3-Clause" \ org.opencontainers.image.authors="Abhinav Singh " \ - org.opencontainers.image.vendor="Abhinav Singh" + org.opencontainers.image.vendor="Abhinav Singh" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.documentation="https://github.com/abhinavsingh/proxy.py#readme" \ + org.opencontainers.image.ref.name="abhinavsingh/proxy.py" \ + com.abhinavsingh.docker.cmd="docker run -it --rm -p 8899:8899 abhinavsingh/proxy.py" ENV PYTHONUNBUFFERED 1 ENV PYTHONDONTWRITEBYTECODE 1 diff --git a/DockerfileBase b/DockerfileBase index 6bee9f7d..1a86018d 100644 --- a/DockerfileBase +++ b/DockerfileBase @@ -1,17 +1,19 @@ -FROM python:3.11-alpine +FROM python:3.12-alpine -LABEL com.abhinavsingh.name="abhinavsingh/proxy.py" \ - org.opencontainers.image.title="proxy.py" \ - org.opencontainers.image.description="⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • \ +LABEL org.opencontainers.image.title="proxy.py" \ + org.opencontainers.image.description="💫 Ngrok FRP Alternative • ⚡ Fast • 🪶 Lightweight • 0️⃣ Dependency • 🔌 Pluggable • \ 😈 TLS interception • 🔒 DNS-over-HTTPS • 🔥 Poor Man's VPN • ⏪ Reverse & ⏩ Forward • \ 👮🏿 \"Proxy Server\" framework • 🌐 \"Web Server\" framework • ➵ ➶ ➷ ➠ \"PubSub\" framework • \ 👷 \"Work\" acceptor & executor framework" \ - org.opencontainers.url="https://github.com/abhinavsingh/proxy.py" \ + org.opencontainers.image.url="https://github.com/abhinavsingh/proxy.py" \ org.opencontainers.image.source="https://github.com/abhinavsingh/proxy.py" \ - com.abhinavsingh.docker.cmd="docker run -it --rm -p 8899:8899 abhinavsingh/proxy.py" \ org.opencontainers.image.licenses="BSD-3-Clause" \ org.opencontainers.image.authors="Abhinav Singh " \ - org.opencontainers.image.vendor="Abhinav Singh" + org.opencontainers.image.vendor="Abhinav Singh" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.documentation="https://github.com/abhinavsingh/proxy.py#readme" \ + org.opencontainers.image.ref.name="abhinavsingh/proxy.py" \ + com.abhinavsingh.docker.cmd="docker run -it --rm -p 8899:8899 abhinavsingh/proxy.py" ENV PYTHONUNBUFFERED 1 ENV PYTHONDONTWRITEBYTECODE 1 diff --git a/README.md b/README.md index a82ce93f..d38bc4ed 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ [![iOS, iOS Simulator](https://img.shields.io/static/v1?label=tested%20with&message=iOS%20%F0%9F%93%B1%20%7C%20iOS%20Simulator%20%F0%9F%93%B1&color=darkgreen&style=for-the-badge)](https://abhinavsingh.com/proxy-py-a-lightweight-single-file-http-proxy-server-in-python/) [![pypi version](https://img.shields.io/pypi/v/proxy.py?style=flat-square)](https://pypi.org/project/proxy.py/) -[![Python 3.x](https://img.shields.io/static/v1?label=Python&message=3.6%20%7C%203.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11&color=blue&style=flat-square)](https://www.python.org/) +[![Python 3.x](https://img.shields.io/static/v1?label=Python&message=3.6%20%7C%203.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12&color=blue&style=flat-square)](https://www.python.org/) [![Checked with mypy](https://img.shields.io/static/v1?label=MyPy&message=checked&color=blue&style=flat-square)](http://mypy-lang.org/) [![doc](https://img.shields.io/readthedocs/proxypy/latest?style=flat-square&color=darkgreen)](https://proxypy.readthedocs.io/) diff --git a/setup.cfg b/setup.cfg index 4e555abb..5dbde4c3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -66,6 +66,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Internet Topic :: Internet :: Proxy Servers