dockerfiles

Author: rene-d

scripts/Dockerfile-alpine

@@ -1,9 +1,9 @@
-FROM rust:alpine AS builder
+FROM rust:alpine
 
 RUN apk update && \
-    apk add --no-cache bash vim curl vim && \
-    apk add --no-cache py3-numpy py3-tabulate py3-click && \
-    apk add --no-cache clang llvm clang-dev sqlite-dev z3-dev
+    apk add --no-cache bash vim curl wget sudo sqlite && \
+    apk add --no-cache py3-click py3-tabulate py3-numpy && \
+    apk add --no-cache clang clang-dev sqlite-dev z3-dev
 
 ENV RUSTFLAGS='-C target-feature=-crt-static'
 
@@ -14,7 +14,7 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
 WORKDIR /aoc
 
 RUN . /etc/os-release && \
-    echo "export AOC_TARGET_DIR=target/${ID}-${VERSION_ID}" >> /root/.bashrc && \
-    echo "export CARGO_TARGET_DIR=target/${ID}-${VERSION_ID}/$(rustc --version | cut -f2 -d' ')-$(rustc --print host-tuple)" >> /root/.bashrc
+    echo "export AOC_TARGET_DIR=target/${ID}-${VERSION_ID}" >> /etc/bash/bashrc && \
+    echo "export CARGO_TARGET_DIR=target/${ID}-${VERSION_ID}/$(rustc --version | cut -f2 -d' ')-$(rustc --print host-tuple)" >> /etc/bash/bashrc
 
-ENTRYPOINT ["/bin/bash"]
+CMD ["/bin/bash"]

scripts/Dockerfile-debian

@@ -1,11 +1,11 @@
-FROM debian:stable AS builder
+FROM debian
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install -y bash vim curl wget sudo sqlite3 vim \
-                       build-essential cmake gdb python3 python3-venv python3-numpy python3-tabulate python3-click \
-                       clang llvm z3 libsqlite3-dev
+    apt-get install -y bash vim curl wget sudo sqlite3 \
+                       build-essential python3 python3-venv  python3-click python3-tabulate python3-numpy python3-curtsies \
+                       clang libz3-dev libsqlite3-dev
 
 # Rust
 ENV CARGO_HOME=/usr/local/cargo
@@ -45,7 +45,7 @@ RUN apt-get install -y -qq default-jdk
 WORKDIR /aoc
 
 RUN . /etc/os-release && \
-    echo "export AOC_TARGET_DIR=target/${ID}-${VERSION_ID}" >> /root/.bashrc && \
-    echo "export CARGO_TARGET_DIR=target/${ID}-${VERSION_ID}/$(rustc --version | cut -f2 -d' ')-$(rustc --print host-tuple)" >> /root/.bashrc
+    echo "export AOC_TARGET_DIR=target/${ID}-${VERSION_ID}" >> /etc/bash.bashrc && \
+    echo "export CARGO_TARGET_DIR=target/${ID}-${VERSION_ID}/$(rustc --version | cut -f2 -d' ')-$(rustc --print host-tuple)" >> /etc/bash.bashrc
 
-ENTRYPOINT ["/bin/bash"]
+CMD ["/bin/bash"]

scripts/Dockerfile-fedora

@@ -1,12 +1,13 @@
 FROM fedora
 
 RUN dnf upgrade -y && \
-    dnf install -y vim curl wget sudo sqlite3 vim just && \
+    dnf install -y bash vim curl wget sudo sqlite3 && \
+    dnf install -y python3-pip python3-numpy python3-tabulate python3-click python3-curtsies && \
     dnf group install -y development-tools c-development && \
-    dnf install -y cmake gdb clang llvm z3-devel sqlite-devel
+    dnf install -y clang z3-devel sqlite-devel
 
 # Python
-RUN dnf install -y python3-pip python3-devel python3-numpy python3-tabulate python3-click python3-curtsies python3-shapely python3-sympy python3-networkx python3-z3
+RUN dnf install -y python3-shapely python3-sympy python3-networkx python3-z3
 RUN python3 -mvenv /venv/python --system-site-packages
 
 # Rust
@@ -43,7 +44,7 @@ ENV Z3_SYS_Z3_HEADER=/usr/include/z3/z3.h
 WORKDIR /aoc
 
 RUN . /etc/os-release && \
-    echo "export AOC_TARGET_DIR=target/${ID}-${VERSION_ID}" >> /root/.bashrc && \
-    echo "export CARGO_TARGET_DIR=target/${ID}-${VERSION_ID}/$(rustc --version | cut -f2 -d' ')-$(rustc --print host-tuple)" >> /root/.bashrc
+    echo "export AOC_TARGET_DIR=target/${ID}-${VERSION_ID}" >> /etc/bashrc && \
+    echo "export CARGO_TARGET_DIR=target/${ID}-${VERSION_ID}/$(rustc --version | cut -f2 -d' ')-$(rustc --print host-tuple)" >> /etc/bashrc
 
-ENTRYPOINT ["/bin/bash"]
+CMD ["/bin/bash"]