Refactor multi-distro Dockerfile and Makefile:
- Add dynamic BASE_IMAGE selection via ARG for Arch, Debian, Ubuntu, Fedora, CentOS - Introduce conditional package installation and unified Nix installer logic - Implement single-user Nix install without build-users-group for Debian/Ubuntu/Fedora/CentOS - Add Nix environment preparation and PATH fixes - Restore Arch-only makepkg build stage - Extend Makefile with multi-distro build/test workflow - Add base image mappings (arch/debian/ubuntu/fedora/centos) - Add test runner logic for each distro, including Nix devShell fallback scanning - Improve structure with clear section headers and comments https://chatgpt.com/share/69360c94-ef04-800f-afd2-75bc6cd33d4d
This commit is contained in:
Kevin Veen-Birkenbach
169
Dockerfile
169
Dockerfile
@@ -1,31 +1,166 @@
|
||||
FROM archlinux:latest
|
||||
# ------------------------------------------------------------
|
||||
# Base image selector — overridden by Makefile
|
||||
# ------------------------------------------------------------
|
||||
ARG BASE_IMAGE=archlinux:latest
|
||||
FROM ${BASE_IMAGE}
|
||||
|
||||
# 1) System basis + Nix
|
||||
RUN pacman -Syu --noconfirm \
|
||||
&& pacman -S --noconfirm --needed \
|
||||
base-devel \
|
||||
git \
|
||||
nix \
|
||||
rsync \
|
||||
&& pacman -Scc --noconfirm
|
||||
# ------------------------------------------------------------
|
||||
# System base + conditional package installation
|
||||
# ------------------------------------------------------------
|
||||
RUN set -e; \
|
||||
if [ -f /etc/os-release ]; then . /etc/os-release; else echo "No /etc/os-release found" && exit 1; fi; \
|
||||
echo "Detected base image: ${ID:-unknown} (like: ${ID_LIKE:-})"; \
|
||||
\
|
||||
# --------------------------------------------------------
|
||||
# Archlinux: Nix via pacman
|
||||
# --------------------------------------------------------
|
||||
if [ "$ID" = "arch" ]; then \
|
||||
pacman -Syu --noconfirm && \
|
||||
pacman -S --noconfirm --needed \
|
||||
base-devel \
|
||||
git \
|
||||
nix \
|
||||
rsync && \
|
||||
pacman -Scc --noconfirm; \
|
||||
\
|
||||
# --------------------------------------------------------
|
||||
# Debian: Nix installer (single-user, root, no build-users-group)
|
||||
# --------------------------------------------------------
|
||||
elif [ "$ID" = "debian" ]; then \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
python3 \
|
||||
python3-venv \
|
||||
rsync \
|
||||
bash \
|
||||
xz-utils && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
echo "Preparing /nix + /etc/nix/nix.conf on Debian..." && \
|
||||
mkdir -p /nix && chmod 0755 /nix && chown root:root /nix && \
|
||||
mkdir -p /etc/nix && printf 'build-users-group =\n' > /etc/nix/nix.conf && \
|
||||
echo "Downloading Nix installer on Debian..." && \
|
||||
curl -L https://nixos.org/nix/install -o /tmp/nix-install && \
|
||||
echo "Installing Nix on Debian (single-user, as root, no build-users-group)..." && \
|
||||
HOME=/root NIX_INSTALLER_NO_MODIFY_PROFILE=1 sh /tmp/nix-install --no-daemon && \
|
||||
rm -f /tmp/nix-install; \
|
||||
\
|
||||
# --------------------------------------------------------
|
||||
# Ubuntu: Nix installer (single-user, root, no build-users-group)
|
||||
# --------------------------------------------------------
|
||||
elif [ "$ID" = "ubuntu" ]; then \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
tzdata \
|
||||
lsb-release \
|
||||
python3 \
|
||||
python3-venv \
|
||||
rsync \
|
||||
bash \
|
||||
xz-utils && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
echo "Preparing /nix + /etc/nix/nix.conf on Ubuntu..." && \
|
||||
mkdir -p /nix && chmod 0755 /nix && chown root:root /nix && \
|
||||
mkdir -p /etc/nix && printf 'build-users-group =\n' > /etc/nix/nix.conf && \
|
||||
echo "Downloading Nix installer on Ubuntu..." && \
|
||||
curl -L https://nixos.org/nix/install -o /tmp/nix-install && \
|
||||
echo "Installing Nix on Ubuntu (single-user, as root, no build-users-group)..." && \
|
||||
HOME=/root NIX_INSTALLER_NO_MODIFY_PROFILE=1 sh /tmp/nix-install --no-daemon && \
|
||||
rm -f /tmp/nix-install; \
|
||||
\
|
||||
# --------------------------------------------------------
|
||||
# Fedora: Nix installer (single-user, root, no build-users-group)
|
||||
# --------------------------------------------------------
|
||||
elif [ "$ID" = "fedora" ]; then \
|
||||
dnf -y update && \
|
||||
dnf -y install \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
python3 \
|
||||
rsync \
|
||||
bash \
|
||||
xz && \
|
||||
dnf clean all && \
|
||||
echo "Preparing /nix + /etc/nix/nix.conf on Fedora..." && \
|
||||
mkdir -p /nix && chmod 0755 /nix && chown root:root /nix && \
|
||||
mkdir -p /etc/nix && printf 'build-users-group =\n' > /etc/nix/nix.conf && \
|
||||
echo "Downloading Nix installer on Fedora..." && \
|
||||
curl -L https://nixos.org/nix/install -o /tmp/nix-install && \
|
||||
echo "Installing Nix on Fedora (single-user, as root, no build-users-group)..." && \
|
||||
HOME=/root NIX_INSTALLER_NO_MODIFY_PROFILE=1 sh /tmp/nix-install --no-daemon && \
|
||||
rm -f /tmp/nix-install; \
|
||||
\
|
||||
# --------------------------------------------------------
|
||||
# CentOS Stream: Nix installer (single-user, root, no build-users-group)
|
||||
# --------------------------------------------------------
|
||||
elif [ "$ID" = "centos" ]; then \
|
||||
dnf -y update && \
|
||||
dnf -y install \
|
||||
ca-certificates \
|
||||
curl-minimal \
|
||||
git \
|
||||
python3 \
|
||||
rsync \
|
||||
bash \
|
||||
xz && \
|
||||
dnf clean all && \
|
||||
echo "Preparing /nix + /etc/nix/nix.conf on CentOS..." && \
|
||||
mkdir -p /nix && chmod 0755 /nix && chown root:root /nix && \
|
||||
mkdir -p /etc/nix && printf 'build-users-group =\n' > /etc/nix/nix.conf && \
|
||||
echo "Downloading Nix installer on CentOS..." && \
|
||||
curl -L https://nixos.org/nix/install -o /tmp/nix-install && \
|
||||
echo "Installing Nix on CentOS (single-user, as root, no build-users-group)..." && \
|
||||
HOME=/root NIX_INSTALLER_NO_MODIFY_PROFILE=1 sh /tmp/nix-install --no-daemon && \
|
||||
rm -f /tmp/nix-install; \
|
||||
\
|
||||
# --------------------------------------------------------
|
||||
# Unknown distro
|
||||
# --------------------------------------------------------
|
||||
else \
|
||||
echo "Unsupported base image: ${ID}" && exit 1; \
|
||||
fi
|
||||
|
||||
# Nix CLI behavior (used later in tests)
|
||||
ENV NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
ENV PATH="/root/.nix-profile/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
# 2) Unprivileged user for building Arch packages
|
||||
# ------------------------------------------------------------
|
||||
# Create unprivileged build user (used on Arch for makepkg)
|
||||
# ------------------------------------------------------------
|
||||
RUN useradd -m builder
|
||||
|
||||
# 3) Build-Stage (optional): einmal aus /build bauen, wenn du magst
|
||||
# ------------------------------------------------------------
|
||||
# Build stage — only active on Arch
|
||||
# ------------------------------------------------------------
|
||||
WORKDIR /build
|
||||
COPY . .
|
||||
RUN chown -R builder:builder /build \
|
||||
&& su builder -c "cd /build && rm -f package-manager-*.pkg.tar.* && makepkg -sf --noconfirm --clean" \
|
||||
&& pacman -U --noconfirm package-manager-*.pkg.tar.* \
|
||||
&& rm -rf /build
|
||||
|
||||
# 4) Runtime-Workingdir für das gemountete Repo
|
||||
RUN set -e; \
|
||||
if [ -f /etc/os-release ]; then . /etc/os-release; fi; \
|
||||
if [ "$ID" = "arch" ]; then \
|
||||
echo "Running Arch build stage (makepkg)..."; \
|
||||
chown -R builder:builder /build && \
|
||||
su builder -c "cd /build && rm -f package-manager-*.pkg.tar.* && makepkg -sf --noconfirm --clean"; \
|
||||
pacman -U --noconfirm package-manager-*.pkg.tar.*; \
|
||||
else \
|
||||
echo "Non-Arch base detected — skipping Arch package build."; \
|
||||
fi; \
|
||||
rm -rf /build
|
||||
|
||||
# ------------------------------------------------------------
|
||||
# Runtime working directory for the mounted repository
|
||||
# ------------------------------------------------------------
|
||||
WORKDIR /src
|
||||
|
||||
# 5) Entry-Script für „always build from /src“
|
||||
# ------------------------------------------------------------
|
||||
# Development entry script
|
||||
# ------------------------------------------------------------
|
||||
COPY scripts/docker-entry-dev.sh /usr/local/bin/docker-entry-dev.sh
|
||||
RUN chmod +x /usr/local/bin/docker-entry-dev.sh
|
||||
|
||||
|
||||
Reference in New Issue
Block a user