Skip to content

Commit 49c6c14

Browse files
committed
upgrade to py3.14 and fedora 43
1 parent b352790 commit 49c6c14

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ COPY ./frontend/ .
1313
RUN bun run build
1414

1515
# Base fedora container
16-
FROM --platform=$TARGETARCH quay.io/fedora/fedora:42 AS base
17-
RUN dnf -y update && dnf install -y python3.13 libnetfilter_queue \
16+
FROM --platform=$TARGETARCH quay.io/fedora/fedora:43 AS base
17+
RUN dnf -y update && dnf install -y python3.14 libnetfilter_queue \
1818
libnfnetlink libmnl libcap-ng-utils nftables \
1919
vectorscan libtins python3-nftables libpcap && dnf clean all
2020

@@ -23,24 +23,24 @@ WORKDIR /execute
2323

2424
FROM --platform=$TARGETARCH base AS compiler
2525

26-
RUN dnf -y update && dnf install -y python3.13-devel @development-tools gcc-c++ \
26+
RUN dnf -y update && dnf install -y python3.14-devel @development-tools gcc-c++ \
2727
libnetfilter_queue-devel libnfnetlink-devel libmnl-devel \
2828
vectorscan-devel libtins-devel libpcap-devel boost-devel
2929

3030
COPY ./backend/binsrc /execute/binsrc
3131
RUN g++ binsrc/nfregex.cpp -o cppregex -std=c++23 -O3 -lnetfilter_queue -pthread -lnfnetlink $(pkg-config --cflags --libs libtins libhs libmnl)
32-
RUN g++ binsrc/nfproxy.cpp -o cpproxy -std=c++23 -O3 -lnetfilter_queue -lpython3.13 -pthread -lnfnetlink $(pkg-config --cflags --libs libtins libmnl python3)
32+
RUN g++ binsrc/nfproxy.cpp -o cpproxy -std=c++23 -O3 -lnetfilter_queue -lpython3.14 -pthread -lnfnetlink $(pkg-config --cflags --libs libtins libmnl python3)
3333

3434
#Building main conteiner
3535
FROM --platform=$TARGETARCH base AS final
3636

3737
COPY ./backend/requirements.txt /execute/requirements.txt
3838
COPY ./fgex-lib /execute/fgex-lib
3939

40-
RUN dnf -y update && dnf install -y gcc-c++ python3.13-devel uv git &&\
40+
RUN dnf -y update && dnf install -y gcc-c++ python3.14-devel uv git &&\
4141
uv pip install --no-cache --system ./fgex-lib &&\
4242
uv pip install --no-cache --system -r /execute/requirements.txt &&\
43-
uv cache clean && dnf remove -y gcc-c++ python3.13-devel uv git && dnf clean all
43+
uv cache clean && dnf remove -y gcc-c++ python3.14-devel uv git && dnf clean all
4444

4545
COPY ./backend/ /execute/
4646
COPY --from=compiler /execute/cppregex /execute/cpproxy /execute/modules/

backend/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ uvicorn[standard]
44
psutil
55
python-jose[cryptography]
66
python-socketio
7-
git+https://github.com/google/brotli.git@35d4992ac8eb1eca3b6c5f220e76cfc8b7e470aa
7+
git+https://github.com/google/brotli.git
88
#git+https://salsa.debian.org/pkg-netfilter-team/pkg-nftables#egg=nftables&subdirectory=py

fgex-lib/firegex/nfproxy/models/http.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from firegex.nfproxy.internals.models import FullStreamAction, ExceptionAction
1111
from dataclasses import dataclass, field
1212
from collections import deque
13-
from zstd import ZSTD_uncompress
13+
from compression import zstd
1414
import gzip
1515
import io
1616
import zlib
@@ -200,7 +200,7 @@ def on_message_complete(self):
200200
break
201201
elif enc == "zstd":
202202
try:
203-
decoding_body = ZSTD_uncompress(decoding_body)
203+
decoding_body = zstd.decompress(decoding_body)
204204
except Exception as e:
205205
print(f"Error decompressing zstd: {e}: skipping", flush=True)
206206
decode_success = False

fgex-lib/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ typer
22
pydantic>=2
33
typing-extensions>=4.7.1
44
pycryptodome
5-
zstd
65
watchfiles
76
fgex
87
websockets

tests/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ERROR=0
88

99
pip3 install -r requirements.txt
1010

11-
until curl --output /dev/null --silent --fail http://localhost:4444/api/status; do
11+
until curl --output /dev/null --silent --fail http://127.0.0.1:4444/api/status; do
1212
printf '.'
1313
sleep 1
1414
done

0 commit comments

Comments
 (0)