ahamilton/eris
1
0
Fork 0
Code Releases Activity

fix package names for Fedora 44 and Arch; pin Dockerfile base images to current distro releases

Browse source
This commit is contained in:
Andrew Hamilton 2026-07-30 09:05:58 +10:00
parent c6a076c31d
commit 7e758b4da5
6 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
eris/__main__.py
View file

@ -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_]

2
packaging/Dockerfile.alpine
View file

@ -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

6
packaging/Dockerfile.arch
View file

@ -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"]

4
packaging/Dockerfile.debian
View file

@ -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

4
packaging/Dockerfile.fedora
View file

@ -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

4
packaging/Dockerfile.ubuntu
View file

@ -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