Update Debian 12 Dockerfile
1. Automatically detect the required Zig version rather than using a hardcoded value. 2. Run `ghostty +version` after the build as a sanity check.pull/6776/head
parent
c344c320eb
commit
7f7191dfec
|
|
@ -7,6 +7,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -qq update && \
|
||||||
# Build Tools
|
# Build Tools
|
||||||
blueprint-compiler \
|
blueprint-compiler \
|
||||||
build-essential \
|
build-essential \
|
||||||
|
curl \
|
||||||
libbz2-dev \
|
libbz2-dev \
|
||||||
libonig-dev \
|
libonig-dev \
|
||||||
libxml2-utils \
|
libxml2-utils \
|
||||||
|
|
@ -28,10 +29,12 @@ RUN . /etc/os-release; if [ $VERSION_ID -le 12 ]; then ln -s libbz2.so /usr/lib/
|
||||||
|
|
||||||
# Install zig
|
# Install zig
|
||||||
# https://ziglang.org/download/
|
# https://ziglang.org/download/
|
||||||
ARG ZIG_VERSION="0.14.0"
|
|
||||||
RUN wget -q "https://ziglang.org/download/$ZIG_VERSION/zig-linux-$(uname -m)-$ZIG_VERSION.tar.xz" && \
|
COPY ./build.zig /src/build.zig
|
||||||
tar -xf "zig-linux-$(uname -m)-$ZIG_VERSION.tar.xz" -C /opt && \
|
|
||||||
rm zig-linux-* && \
|
RUN export ZIG_VERSION=$(sed -n -e 's/^.*requireZig("\(.*\)").*$/\1/p' /src/build.zig) && curl -L -o /tmp/zig.tar.xz "https://ziglang.org/download/$ZIG_VERSION/zig-linux-$(uname -m)-$ZIG_VERSION.tar.xz" && \
|
||||||
|
tar -xf /tmp/zig.tar.xz -C /opt && \
|
||||||
|
rm /tmp/zig.tar.xz && \
|
||||||
ln -s "/opt/zig-linux-$(uname -m)-$ZIG_VERSION/zig" /usr/local/bin/zig
|
ln -s "/opt/zig-linux-$(uname -m)-$ZIG_VERSION/zig" /usr/local/bin/zig
|
||||||
|
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
@ -54,3 +57,5 @@ COPY ./src /src/src
|
||||||
# Debian 12 doesn't have gtk4-layer-shell, so we have to manually compile it ourselves
|
# Debian 12 doesn't have gtk4-layer-shell, so we have to manually compile it ourselves
|
||||||
RUN zig build -Doptimize=Debug -Dcpu=baseline -Dapp-runtime=gtk -fno-sys=gtk4-layer-shell --system /zig/global-cache/p
|
RUN zig build -Doptimize=Debug -Dcpu=baseline -Dapp-runtime=gtk -fno-sys=gtk4-layer-shell --system /zig/global-cache/p
|
||||||
|
|
||||||
|
RUN ./zig-out/bin/ghostty +version
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue