فهرست منبع

contrib: Updated dockerfiles to build with rust 1.64, added dependency fontconfig-dev

spital 3 سال پیش
والد
کامیت
e17ea900ab
3فایلهای تغییر یافته به همراه9 افزوده شده و 6 حذف شده
  1. 6 3
      contrib/docker/Dockerfile.alpine
  2. 2 2
      contrib/docker/Dockerfile.debian
  3. 1 1
      contrib/docker/Dockerfile.fedora

+ 6 - 3
contrib/docker/Dockerfile.alpine

@@ -2,7 +2,7 @@
 #   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,1.62}
 
-ARG RUST_VER=1.62
+ARG RUST_VER=1.64
 ARG ALPINE_VER=3.16
 
 FROM rust:${RUST_VER}-alpine${ALPINE_VER}
@@ -12,7 +12,10 @@ ARG ALPINE_VER
 
 RUN echo "=======================================================" \
     &&echo "===>>>>> The following error will occur during the test::" \
-    && echo "process didn't exit successfully: /opt/darkfi/target/release/deps/darkfi-7ff55152bc1bdc59 (signal: 11, SIGSEGV: invalid memory reference)" \
+    && echo "test util::parse::tests::test_truncate ... ok" \
+    && echo "test runtime::memory::tests::can_read_from_memory ... ok" \
+    && echo "error: test failed, to rerun pass '-p darkfi --lib'" \
+    && echo ".... process didn't exit successfully: /opt/darkfi/target/release/deps/darkfi-... (signal: 11, SIGSEGV: invalid memory reference)" \
     && echo "rust ${RUST_VER} / alpine ${ALPINE_VER}" \
     && rustc -V && cargo -V \
     && cat /etc/os-release  \
@@ -24,7 +27,7 @@ RUN apk update
 RUN apk add cmake jq wget clang curl gcc make
 RUN apk add llvm-dev openssl-dev expat-dev freetype-dev
 RUN apk add libudev-zero-dev libgudev-dev
-RUN apk add pkgconf clang-dev
+RUN apk add pkgconf clang-dev fontconfig-dev
 
 RUN apk add build-base
 

+ 2 - 2
contrib/docker/Dockerfile.debian

@@ -3,7 +3,7 @@
 #   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.62  # 1.60 1.61
+ARG RUST_VER=1.64  # 1.60 1.61 1.62
 ARG BUILD_OS_VER=slim-bullseye  # slim-buster
 ARG RUN_OS_VER=bullseye-slim    # buster-slim
 ARG REPOSITORY=rust             # rustlang/rust
@@ -12,7 +12,7 @@ FROM ${REPOSITORY}:${RUST_VER}-${BUILD_OS_VER} as builder
 
 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
+  libexpat1-dev curl gcc make libssl-dev fonts-lato libfontconfig-dev
 
 RUN mkdir /opt/darkfi
 

+ 1 - 1
contrib/docker/Dockerfile.fedora

@@ -9,7 +9,7 @@ FROM ${OS_VER} as builder
 RUN dnf -y install cargo rustc gcc gcc-c++ kernel-headers cmake jq wget \
   pkg-config clang clang-libs llvm-libs \
   rust-libudev-devel rust-freetype-rs-devel \
-  rust-expat-sys-devel openssl-devel findutils
+  rust-expat-sys-devel openssl-devel findutils fontconfig-devel
 
 COPY . /opt/darkfi