Skip to content

Commit 5e7c26c

Browse files
committed
dockerfile: add ARCH parameter
1 parent d701926 commit 5e7c26c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
FROM ubuntu:24.04
22

3+
ARG MINISIG=0.12
34
ARG ZIG=0.13.0
45
ARG ZIG_MINISIG=RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U
5-
ARG OS=linux
66
ARG ARCH=x86_64
77
ARG V8=11.1.134
8-
ARG ZIG_V8=v0.1.11
8+
ARG ZIG_V8=v0.1.12
99

1010
RUN apt-get update -yq && \
1111
apt-get install -yq xz-utils \
@@ -16,25 +16,25 @@ RUN apt-get update -yq && \
1616
curl git
1717

1818
# install minisig
19-
RUN curl -L -O https://github.com/jedisct1/minisign/releases/download/0.11/minisign-0.11-linux.tar.gz && \
20-
tar xvzf minisign-0.11-linux.tar.gz
19+
RUN curl --fail -L -O https://github.com/jedisct1/minisign/releases/download/${MINISIG}/minisign-${MINISIG}-linux.tar.gz && \
20+
tar xvzf minisign-${MINISIG}-linux.tar.gz
2121

2222
# install zig
23-
RUN curl -O https://ziglang.org/download/${ZIG}/zig-linux-x86_64-${ZIG}.tar.xz && \
24-
curl -O https://ziglang.org/download/${ZIG}/zig-linux-x86_64-${ZIG}.tar.xz.minisig
23+
RUN curl --fail -L -O https://ziglang.org/download/${ZIG}/zig-linux-${ARCH}-${ZIG}.tar.xz
24+
RUN curl --fail -L -O https://ziglang.org/download/${ZIG}/zig-linux-${ARCH}-${ZIG}.tar.xz.minisig
2525

26-
RUN minisign-linux/x86_64/minisign -Vm zig-linux-x86_64-${ZIG}.tar.xz -P ${ZIG_MINISIG}
26+
RUN minisign-linux/${ARCH}/minisign -Vm zig-linux-${ARCH}-${ZIG}.tar.xz -P ${ZIG_MINISIG}
2727

2828
# clean minisg
2929
RUN rm -fr minisign-0.11-linux.tar.gz minisign-linux
3030

3131
# install zig
32-
RUN tar xvf zig-linux-x86_64-${ZIG}.tar.xz && \
33-
mv zig-linux-x86_64-${ZIG} /usr/local/lib && \
34-
ln -s /usr/local/lib/zig-linux-x86_64-${ZIG}/zig /usr/local/bin/zig
32+
RUN tar xvf zig-linux-${ARCH}-${ZIG}.tar.xz && \
33+
mv zig-linux-${ARCH}-${ZIG} /usr/local/lib && \
34+
ln -s /usr/local/lib/zig-linux-${ARCH}-${ZIG}/zig /usr/local/bin/zig
3535

3636
# clean up zig install
37-
RUN rm -fr zig-linux-x86_64-${ZIG}.tar.xz zig-linux-x86_64-${ZIG}.tar.xz.minisig
37+
RUN rm -fr zig-linux-${ARCH}-${ZIG}.tar.xz zig-linux-${ARCH}-${ZIG}.tar.xz.minisig
3838

3939
# force use of http instead of ssh with github
4040
RUN cat <<EOF > /root/.gitconfig
@@ -60,7 +60,7 @@ RUN make install-libiconv && \
6060
make install-mimalloc
6161

6262
# download and install v8
63-
RUN curl -L -o libc_v8.a https://github.com/lightpanda-io/zig-v8-fork/releases/download/${ZIG_V8}/libc_v8_${V8}_linux_${ARCH}.a && \
63+
RUN curl --fail -L -o libc_v8.a https://github.com/lightpanda-io/zig-v8-fork/releases/download/${ZIG_V8}/libc_v8_${V8}_linux_${ARCH}.a && \
6464
mkdir -p vendor/zig-js-runtime/vendor/v8/${ARCH}-linux/release && \
6565
mv libc_v8.a vendor/zig-js-runtime/vendor/v8/${ARCH}-linux/release/libc_v8.a
6666

0 commit comments

Comments
 (0)