Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions tools/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,19 @@ RUN corepack enable
#
# NOTE(rfratto): musl is installed so the Docker binaries from alpine work
# properly.
RUN apt-get update \
&& apt-get install -qy \
build-essential file zip unzip gettext git \
musl libsystemd-dev nsis \
rpm ruby ruby-dev rubygems \
protobuf-compiler libprotobuf-dev yamllint \
&& gem install --no-document fpm \
&& rm -rf /var/lib/apt/lists/*
ARG RUST_TOOLCHAIN=1.77
RUN apt-get update \
&& apt-get install -qy \
build-essential file zip unzip gettext git \
musl libsystemd-dev nsis cmake \
rpm ruby ruby-dev rubygems \
protobuf-compiler libprotobuf-dev yamllint \
&& gem install --no-document fpm \
&& rm -rf /var/lib/apt/lists/* \
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --profile minimal --default-toolchain $RUST_TOOLCHAIN \
&& /root/.cargo/bin/rustup target add aarch64-unknown-linux-musl \
&& /root/.cargo/bin/rustup target add x86_64-unknown-linux-musl

COPY --from=golangci /bin/golangci-lint /usr/local/bin
COPY --from=docker /usr/bin/docker /usr/bin/docker
Expand All @@ -110,4 +115,4 @@ RUN git config --global --add safe.directory \*
ENV CC viceroycc

ENV GOPATH /go
ENV PATH /usr/local/go/bin:/go/bin:$PATH
ENV PATH /usr/local/go/bin:/go/bin:/root/.cargo/bin/:$PATH