|
@@ -3,18 +3,16 @@
|
|
|
# optionally with: --build-arg BUILD_OS_VER=slim-buster --build-arg RUN_OS_VER=buster-slim --build-arg RUST_VER=1.60
|
|
# optionally with: --build-arg BUILD_OS_VER=slim-buster --build-arg RUN_OS_VER=buster-slim --build-arg RUST_VER=1.60
|
|
|
# rust nightly with: BUILD_OS_VER=bullseye-slim RUN_OS_VER=bullseye-slim RUST_VER=nightly REPOSITORY=rustlang/rust
|
|
# rust nightly with: BUILD_OS_VER=bullseye-slim RUN_OS_VER=bullseye-slim RUST_VER=nightly REPOSITORY=rustlang/rust
|
|
|
|
|
|
|
|
-ARG RUST_VER=1.61 # 1.60
|
|
|
|
|
|
|
+ARG RUST_VER=1.62 # 1.60 1.61
|
|
|
ARG BUILD_OS_VER=slim-bullseye # slim-buster
|
|
ARG BUILD_OS_VER=slim-bullseye # slim-buster
|
|
|
ARG RUN_OS_VER=bullseye-slim # buster-slim
|
|
ARG RUN_OS_VER=bullseye-slim # buster-slim
|
|
|
ARG REPOSITORY=rust # rustlang/rust
|
|
ARG REPOSITORY=rust # rustlang/rust
|
|
|
|
|
|
|
|
FROM ${REPOSITORY}:${RUST_VER}-${BUILD_OS_VER} as builder
|
|
FROM ${REPOSITORY}:${RUST_VER}-${BUILD_OS_VER} as builder
|
|
|
|
|
|
|
|
-RUN apt-get -y update
|
|
|
|
|
-
|
|
|
|
|
-RUN apt-get install -y build-essential cmake jq wget pkg-config \
|
|
|
|
|
- clang libclang-dev llvm-dev libudev-dev libfreetype6-dev \
|
|
|
|
|
- libexpat1-dev curl gcc make libssl-dev
|
|
|
|
|
|
|
+RUN apt-get update && apt-get install -y build-essential cmake jq wget \
|
|
|
|
|
+ pkg-config clang libclang-dev llvm-dev libudev-dev libfreetype6-dev \
|
|
|
|
|
+ libexpat1-dev curl gcc make libssl-dev fonts-lato
|
|
|
|
|
|
|
|
RUN mkdir /opt/darkfi
|
|
RUN mkdir /opt/darkfi
|
|
|
|
|
|
|
@@ -31,6 +29,9 @@ RUN bash -c 'make -j test && make -j all'
|
|
|
# 2. stage
|
|
# 2. stage
|
|
|
FROM debian:${RUN_OS_VER}
|
|
FROM debian:${RUN_OS_VER}
|
|
|
|
|
|
|
|
|
|
+RUN apt-get -y update && apt-get install -y openssl fonts-lato \
|
|
|
|
|
+ && rm -rf /var/lib/apt/lists/*
|
|
|
|
|
+
|
|
|
COPY --from=builder /opt/darkfi/darkfid /opt/darkfi/
|
|
COPY --from=builder /opt/darkfi/darkfid /opt/darkfi/
|
|
|
COPY --from=builder /opt/darkfi/dnetview /opt/darkfi/
|
|
COPY --from=builder /opt/darkfi/dnetview /opt/darkfi/
|
|
|
COPY --from=builder /opt/darkfi/drk /opt/darkfi/
|
|
COPY --from=builder /opt/darkfi/drk /opt/darkfi/
|