Parcourir la source

Tested rust 1.62, added Openssl and fonts-lato to avoid few test panic (#85)

* Dockerfile added for Fedora, Alpine, Debian

* Dockerfiles moved to ./contrib/docker, "." filter needed for jq in debian-buster

* Deleted dockerfiles from old dir, "." filter needed for jq in debian-buster

* Amend Debian Dockerfile to allow build with rust nightly

* add fonts-lato to fix few test panic at called `Result::unwrap()` on an `Err` value: BackendError(FontError(NoSuchFont("sans-serif", "normal")))
spital il y a 4 ans
Parent
commit
68fbb4367e
2 fichiers modifiés avec 9 ajouts et 8 suppressions
  1. 2 2
      contrib/docker/Dockerfile.alpine
  2. 7 6
      contrib/docker/Dockerfile.debian

+ 2 - 2
contrib/docker/Dockerfile.alpine

@@ -1,8 +1,8 @@
 # Use: docker build . -t darkfi:alpine${alpine_ver}_rust${rust_ver} -f ./contrib/docker/Dockerfile.alpine
 #   optionally with: --build-arg ALPINE_VER=$alpine_ver --build-arg RUST_VER=$rust_ver
-# The wallet test fail problem (see below) was the same for alpine {3.14,3.15,3.16} and rust {1.60,1.61}
+# The wallet test fail problem (see below) was the same for alpine {3.14,3.15,3.16} and rust {1.60,1.61,1.62}
 
-ARG RUST_VER=1.61
+ARG RUST_VER=1.62
 ARG ALPINE_VER=3.16
 
 FROM rust:${RUST_VER}-alpine${ALPINE_VER}

+ 7 - 6
contrib/docker/Dockerfile.debian

@@ -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
 #   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 RUN_OS_VER=bullseye-slim    # buster-slim
 ARG REPOSITORY=rust             # rustlang/rust
 
 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
 
@@ -31,6 +29,9 @@ RUN bash -c 'make -j test &&  make -j all'
 # 2. stage
 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/dnetview /opt/darkfi/
 COPY --from=builder /opt/darkfi/drk /opt/darkfi/