From 7e758b4da5b6f7fa92eeb7f870a48d64a636bf66 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Thu, 30 Jul 2026 09:05:58 +1000 Subject: [PATCH] fix package names for Fedora 44 and Arch; pin Dockerfile base images to current distro releases --- eris/__main__.py | 9 +++++++-- packaging/Dockerfile.alpine | 2 +- packaging/Dockerfile.arch | 6 ++---- packaging/Dockerfile.debian | 4 ++-- packaging/Dockerfile.fedora | 4 ++-- packaging/Dockerfile.ubuntu | 4 ++-- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/eris/__main__.py b/eris/__main__.py index daa47d0..38cdcff 100755 --- a/eris/__main__.py +++ b/eris/__main__.py @@ -1161,7 +1161,9 @@ def install_all_tools(): install_command = ["apt", "-y", "install"] # debian / ubuntu if "ID=fedora\n" in os_release_lines: tools_.remove("lua-check") - renames = {"lua5.3": "lua", "python3-bandit": "bandit", "xz-utils": "xz"} + tools_.remove("python3-bandit") + tools_.remove("rubocop") + renames = {"lua5.3": "lua", "node-typescript": "typescript", "rust-clippy": "clippy", "xz-utils": "xz"} tools_ = [renames.get(tool, tool) for tool in tools_] install_command = ["dnf", "-y", "install"] elif "ID=arch\n" in os_release_lines: @@ -1169,9 +1171,12 @@ def install_all_tools(): tools_.remove("python3-pdfminer") # pdf2txt is not in arch tools_.remove("perl-doc") # perldoc is in perl but not in the path tools_.remove("7zip") + tools_.remove("node-typescript") + tools_.remove("rust-clippy") renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "xz-utils": "xz", "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php", - "pylint": "python-pylint", "python3-bandit": "bandit", "python3-mypy": "mypy"} + "pylint": "python-pylint", "python3-bandit": "bandit", "python3-mypy": "mypy", + "black": "python-black", "rustfmt": "rust"} tools_ = [renames.get(tool, tool) for tool in tools_] tools_ = ["python-" + tool[len("python3-"):] if tool.startswith("python3-") else tool for tool in tools_] diff --git a/packaging/Dockerfile.alpine b/packaging/Dockerfile.alpine index 8e1ca19..4bac089 100644 --- a/packaging/Dockerfile.alpine +++ b/packaging/Dockerfile.alpine @@ -1,6 +1,6 @@ -FROM alpine:3.19.1 +FROM alpine:3.24 RUN apk add gcc g++ make sudo python3-dev musl-dev git cmake glfw-dev pkgconfig libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev wayland-dev libxkbcommon-dev mesa-dev RUN wget -qO- https://astral.sh/uv/install.sh | sh diff --git a/packaging/Dockerfile.arch b/packaging/Dockerfile.arch index ccaf687..742e9f1 100644 --- a/packaging/Dockerfile.arch +++ b/packaging/Dockerfile.arch @@ -1,15 +1,13 @@ -FROM archlinux:base-20240101.0.204074 +FROM archlinux:latest -RUN pacman -Sy -RUN pacman --noconfirm -S gcc python-devtools git cmake glfw pkg-config libx11 libxcursor libxrandr libxinerama libxi libxext wayland libxkbcommon mesa +RUN pacman -Sy --noconfirm gcc python make git cmake glfw pkg-config libx11 libxcursor libxrandr libxinerama libxi libxext wayland libxkbcommon mesa sudo RUN curl -LsSf https://astral.sh/uv/install.sh | sh ENV PATH="/root/.local/bin:${PATH}" COPY . eris RUN uv tool install --python 3.14 ./eris RUN chmod a+rwx -R /root -RUN pacman --noconfirm -S sudo RUN eris --install-all-tools ENTRYPOINT ["eris"] diff --git a/packaging/Dockerfile.debian b/packaging/Dockerfile.debian index a78784f..e3ceb92 100644 --- a/packaging/Dockerfile.debian +++ b/packaging/Dockerfile.debian @@ -1,9 +1,9 @@ -FROM debian:bookworm +FROM debian:trixie RUN apt-get update -RUN apt-get install -y build-essential curl git cmake libglfw3-dev pkg-config libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev +RUN apt-get install -y build-essential curl git cmake libglfw3-dev pkg-config libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev python3-dev RUN curl -LsSf https://astral.sh/uv/install.sh | sh ENV PATH="/root/.local/bin:${PATH}" COPY . eris diff --git a/packaging/Dockerfile.fedora b/packaging/Dockerfile.fedora index 6cbe5f9..c3c87d0 100644 --- a/packaging/Dockerfile.fedora +++ b/packaging/Dockerfile.fedora @@ -1,8 +1,8 @@ -FROM fedora:40 +FROM fedora:44 -RUN dnf -y install gcc gcc-c++ make curl git cmake glfw-devel pkgconfig libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel libXext-devel wayland-devel libxkbcommon-devel mesa-libEGL-devel +RUN dnf -y install gcc gcc-c++ make curl git cmake glfw-devel pkgconfig libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel libXext-devel wayland-devel libxkbcommon-devel mesa-libEGL-devel python3-devel RUN curl -LsSf https://astral.sh/uv/install.sh | sh ENV PATH="/root/.local/bin:${PATH}" COPY . eris diff --git a/packaging/Dockerfile.ubuntu b/packaging/Dockerfile.ubuntu index 1fc4b48..0a84948 100644 --- a/packaging/Dockerfile.ubuntu +++ b/packaging/Dockerfile.ubuntu @@ -1,9 +1,9 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update -RUN apt-get install -y build-essential curl git cmake libglfw3-dev pkg-config libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev +RUN apt-get install -y build-essential curl git cmake libglfw3-dev pkg-config libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev python3-dev RUN curl -LsSf https://astral.sh/uv/install.sh | sh ENV PATH="/root/.local/bin:${PATH}" COPY . eris