.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:
aggstam
2023-06-07 02:29:12 +03:00
parent 03a26f109c
commit 463790ee83
7 changed files with 44 additions and 47 deletions

View File

@@ -1,10 +1,9 @@
# Beware, uses emulation, with AMD 24 threads: Building 6047.7s
# Use: docker build . --platform=linux/arm64 --pull -t darkfi:ubuntu_arm64 -f contrib/docker/Dockerfile.ubuntuARMviaEmulation
# optionally with: --build-arg BUILD_OS_VER=20.04 --build-arg RUST_VER=1.65
# optionally with: --build-arg BUILD_OS_VER=20.04 --build-arg RUST_VER=1.70
ARG RUST_VER=1.67 # stable nightly beta
ARG BUILD_OS_VER=22.04 # 20.04
ARG RUST_VER=1.70 # stable nightly beta 1.67
ARG BUILD_OS_VER=22.04 # 20.04
ARG RUN_OS_VER=${BUILD_OS_VER}
ARG REPOSITORY=ubuntu
@@ -17,7 +16,8 @@ RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
build-essential cmake jq wget curl \
pkg-config clang libclang-dev llvm-dev libudev-dev libfreetype6-dev \
libexpat1-dev curl gcc make libssl-dev fonts-lato libfontconfig-dev
libexpat1-dev curl gcc make libssl-dev fonts-lato libfontconfig-dev \
libasound2-dev
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain "${RUST_VER}"
@@ -25,7 +25,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add wasm32-unknown-unknown
RUN rustup target add aarch64-unknown-linux-gnu
RUN cargo search whatever # creates .cargo cache
RUN cargo search whatever # creates .cargo cache
RUN cargo install -f cross
# 2. stage
@@ -39,7 +39,7 @@ RUN make clean
RUN rm -rf ./target/*
RUN bash -c 'make -j test && make -j all'
RUN bash -c 'make -j test && make -j all'
# 3. stage
FROM --platform=$TARGETPLATFORM ${REPOSITORY}:${RUN_OS_VER}
@@ -51,5 +51,4 @@ WORKDIR /opt/darkfi
COPY --from=builder /opt/darkfi/drk /opt/darkfi/darkfid \
/opt/darkfi/ircd /opt/darkfi/dnetview /opt/darkfi/faucetd \
/opt/darkfi/zkas /opt/darkfi/vanityaddr ./
/opt/darkfi/zkas /opt/darkfi/vanityaddr ./