Forráskód Böngészése

contrib/docker: update Dockerfiles
- use stable rust toolchain
- add missing dependancies
- remove binaries we no longer build

Paul Otten 1 éve
szülő
commit
0a240bea37

+ 1 - 1
bin/darkirc/android.Dockerfile

@@ -12,7 +12,7 @@ RUN cd /tmp/ && \
     sh install-rustup.sh -yq --default-toolchain none && \
     rm install-rustup.sh
 ENV PATH "${PATH}:/root/.cargo/bin/"
-RUN rustup default nightly
+RUN rustup default stable
 RUN rustup target add aarch64-linux-android
 #RUN rustup target add armv7-linux-androideabi
 #RUN rustup target add i686-linux-android

+ 5 - 4
contrib/docker/Dockerfile.debian

@@ -1,7 +1,7 @@
 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:debian -f ./contrib/docker/Dockerfile.debian --build-arg DONT_EXEC_TESTS=1
 #   optionally with: --build-arg OS_VER=bullseye-slim --build-arg RUST_VER=nightly
 
-ARG RUST_VER=nightly-2025-04-10  # nightly 1.72
+ARG RUST_VER=stable              # stable; nightly; 1.77
 ARG OS_VER=bookworm-slim         # (12); bullseye-slim (11); buster-slim (10)
 
 FROM debian:${OS_VER} as rust_builder
@@ -10,7 +10,8 @@ ARG RUST_VER
 
 RUN apt-get update && apt-get install -y build-essential cmake jq wget \
   pkg-config clang libclang-dev llvm-dev libudev-dev libfreetype6-dev libasound2-dev \
-  libexpat1-dev curl gcc make libssl-dev fonts-lato libfontconfig-dev python3-dev libsqlite3-dev
+  libexpat1-dev curl gcc make libssl-dev fonts-lato libfontconfig-dev python3-dev libsqlite3-dev \
+  libsqlcipher-dev wabt
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain "${RUST_VER}"
 
@@ -49,6 +50,6 @@ RUN apt-get -y update && apt-get install -y openssl fonts-lato libout123-0 libmp
 WORKDIR /opt/darkfi
 
 COPY --from=builder /opt/darkfi/drk /opt/darkfi/darkfid  \
-   /opt/darkfi/darkirc /opt/darkfi/faucetd \
+   /opt/darkfi/darkirc \
    /opt/darkfi/zkas /opt/darkfi/vanityaddr \
-   /opt/darkfi/tau /opt/darkfi/taud   ./
+   /opt/darkfi/taud   ./

+ 5 - 6
contrib/docker/Dockerfile.fedora

@@ -1,9 +1,8 @@
 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:fedora -f ./contrib/docker/Dockerfile.fedora --build-arg DONT_EXEC_TESTS=1
 #   optionally with: --build-arg OS_VER=fedora:37 --build-arg RUST_VER=nightly
-#   To use the legacy deprecated builder: DOCKER_BUILDKIT=0
 
-ARG RUST_VER=nightly-2025-04-10  # stable nightly beta 1.72
-ARG OS_VER=fedora:38             # fedora:37
+ARG RUST_VER=stable              # stable; nightly; 1.77
+ARG OS_VER=fedora:38             # fedora:38; fedora:37
 
 FROM ${OS_VER} as rust_builder
 
@@ -14,7 +13,7 @@ RUN dnf -y install gcc gcc-c++ kernel-headers cmake jq wget \
   openssl-devel findutils fontconfig-devel \
   lato-fonts alsa-lib-devel python3-devel \
   perl-FindBin perl-File-Compare perl-lib sqlite-devel \
-  perl-interpreter
+  perl-interpreter sqlcipher-devel wabt
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain "${RUST_VER}"
 
@@ -54,6 +53,6 @@ RUN dnf -y install openssl lato-fonts alsa-lib \
 WORKDIR /opt/darkfi
 
 COPY --from=builder /opt/darkfi/drk /opt/darkfi/darkfid  \
-   /opt/darkfi/darkirc /opt/darkfi/faucetd \
+   /opt/darkfi/darkirc \
    /opt/darkfi/zkas /opt/darkfi/vanityaddr \
-   /opt/darkfi/tau /opt/darkfi/taud   ./
+   /opt/darkfi/taud   ./

+ 5 - 5
contrib/docker/Dockerfile.ubuntu

@@ -1,8 +1,8 @@
 # Use: docker build . --pull --no-cache --shm-size=196m -t darkfi:ubuntu -f ./contrib/docker/Dockerfile.ubuntu --build-arg DONT_EXEC_TESTS=1
 #   optionally with: --build-arg OS_VER=20.04 --build-arg RUST_VER=nightly
 
-ARG RUST_VER=nightly-2025-04-10  # stable nightly beta 1.72
-ARG OS_VER=22.04                 # 20.04
+ARG RUST_VER=stable              # stable; nightly; 1.77
+ARG OS_VER=22.04                 # 22.04; 20.04
 
 FROM ubuntu:${OS_VER} as rust_builder
 
@@ -12,7 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
   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 \
-  libasound2-dev python3-dev libsqlite3-dev
+  libasound2-dev python3-dev libsqlite3-dev libsqlcipher-dev wabt
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain "${RUST_VER}"
 
@@ -51,6 +51,6 @@ RUN apt-get -y update && apt-get install -y openssl fonts-lato libout123-0 libmp
 WORKDIR /opt/darkfi
 
 COPY --from=builder /opt/darkfi/drk /opt/darkfi/darkfid  \
-   /opt/darkfi/darkirc /opt/darkfi/faucetd \
+   /opt/darkfi/darkirc \
    /opt/darkfi/zkas /opt/darkfi/vanityaddr \
-   /opt/darkfi/tau /opt/darkfi/taud  ./
+   /opt/darkfi/taud  ./