mirror of
https://github.com/darkrenaissance/darkfi.git
synced 2026-01-09 14:48:08 -05:00
.github/workflows/ci.yml: updated dependencies, contrib/docker/*: updated dependencies and minor cleanup
Only Dockerfile.alpine was tested, it works. Rest should also work. NFA, DYOR
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
# Beware, uses emulation, with AMD 24 threads: Building 7788.3s
|
||||
# Use: docker build . --platform=linux/arm64 --pull -t darkfi:alpine_arm64 -f ./contrib/docker/Dockerfile.alpineARMviaEmulation
|
||||
# optionally with: --build-arg OS_VER=3.17 --build-arg RUST_VER=nightly
|
||||
# optionally with: --build-arg OS_VER=3.18 --build-arg RUST_VER=nightly
|
||||
|
||||
ARG RUST_VER=1.67
|
||||
ARG OS_VER=3.17
|
||||
ARG RUST_VER=1.70 # 1.67
|
||||
ARG OS_VER=3.18 # 3.17
|
||||
ARG REPOSITORY=arm64v8/alpine
|
||||
|
||||
FROM --platform=$TARGETPLATFORM ${REPOSITORY}:${OS_VER} as rust_builder
|
||||
@@ -19,7 +19,7 @@ RUN apk update
|
||||
RUN apk add cmake jq wget clang curl gcc make llvm-dev \
|
||||
openssl-dev expat-dev freetype-dev libudev-zero-dev \
|
||||
libgudev-dev pkgconf clang-dev fontconfig-dev bash \
|
||||
ttf-opensans musl-dev
|
||||
ttf-opensans musl-dev alsa-lib-dev
|
||||
|
||||
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain "${RUST_VER}"
|
||||
|
||||
@@ -27,7 +27,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
|
||||
|
||||
RUN rustup target add wasm32-unknown-unknown
|
||||
|
||||
RUN cargo search whatever # creates .cargo cache
|
||||
RUN cargo search whatever # creates .cargo cache
|
||||
|
||||
# 2. stage
|
||||
FROM --platform=$TARGETPLATFORM rust_builder as builder
|
||||
@@ -42,7 +42,7 @@ RUN make clean
|
||||
|
||||
RUN rm -rf ./target/
|
||||
|
||||
RUN bash -c 'make -j test && make -j'
|
||||
RUN bash -c 'make -j test && make -j'
|
||||
|
||||
# 3. stage
|
||||
FROM --platform=$TARGETPLATFORM ${REPOSITORY}:${OS_VER}
|
||||
|
||||
Reference in New Issue
Block a user