From e8be9361f57f564dee4648b06bda14aaa379599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 3 May 2024 11:48:05 +0300 Subject: [PATCH] zig: use via apk That way we won't need to bump zig versions with new releases. --- Dockerfile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 866e9c8..71d3db3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,13 @@ -FROM alpine +FROM alpine:edge -# zig is installed from the upstream tarball, because: -# - as of writing, alpine has zig only in testing (which is cumbersome to use) -# - apk get zig pulls in libllvm, which is huge. -# -# Upstream tarball is statically linked, making it small and convenient to use. -RUN apk add make \ - && wget https://ziglang.org/download/0.12.0/zig-linux-$(uname -m)-0.12.0.tar.xz \ - && tar -xJf zig-linux-*.tar.xz \ - && rm zig-linux-*.xz \ - && mv zig-linux-* zig +RUN apk add make zig WORKDIR inotify-info COPY . . -RUN CC="/zig/zig cc -target $(uname -m)-linux-musl" \ - CXX="/zig/zig c++ -target $(uname -m)-linux-musl" \ +RUN CC="zig cc -target $(uname -m)-linux-musl" \ + CXX="zig c++ -target $(uname -m)-linux-musl" \ make FROM scratch