Update Dockerfile (#319)

Dockerfile

@@ -1,61 +1,35 @@
-# syntax = docker/dockerfile:1.2
-
-# Phase 0: Builder
+# Phase 1: Builder
 # =========================
-FROM paritytech/ci-linux:1.69.0-bullseye as builder
+FROM debian:12.2-slim as builder
 
 # Install needed packages
-RUN apt-get update && \
-	apt-get install -yqq --no-install-recommends git openssh-client && \
-	rm -rf /var/lib/apt/lists
-
-# Install nightly Rust for WASM  & prepare folders
-# RUN	rustup toolchain install nightly && \
-#	rustup target add wasm32-unknown-unknown --toolchain nightly && \
-#	rustup default nightly
+RUN apt update -y && \
+    apt install build-essential git clang curl libssl-dev llvm libudev-dev make cmake protobuf-compiler -y
 
-# Clone & build node binary.
-ARG AVAIL_TAG=v1.6.0
-RUN \
-	mkdir -p /da/state && \
-	mkdir -p /da/keystore && \
-	git clone -b $AVAIL_TAG --single-branch https://github.com/availproject/avail.git /da/src/ && \
-	cd /da/src && \
-	cargo build --release -p data-avail
+WORKDIR "/da/src"
 
-# Install binaries 
-RUN \ 
-	mkdir -p /da/bin && \
-	mv /da/src/misc/genesis /da && \
-	mv /da/src/target/release/data-avail /da/bin && \
-	# Clean src \
-	rm -rf /da/src
+# Clone repo
+ARG AVAIL_TAG=v1.8.0.2
+RUN git clone -b $AVAIL_TAG --single-branch https://github.com/availproject/avail.git .
 
-# Phase 1: Binary deploy
-# =========================
-FROM debian:bullseye-slim
+# This installs Rust and updates Rust to the right version.
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust_install.sh && chmod u+x rust_install.sh && ./rust_install.sh -y
 
-RUN \
-	apt-get update && \
-	apt-get install -y curl && \
-	rm -rf /var/lib/apt/lists && \
-	groupadd -r avail && \
-	useradd --no-log-init -r -g avail avail
+# Build Binary at /da/src/data-avail
+RUN $HOME/.cargo/bin/rustup show 
+RUN $HOME/.cargo/bin/cargo build --locked --release
+RUN cp ./target/release/data-avail .
 
-COPY --chown=avail.avail --from=builder /da/ /da
-COPY --chown=avail.avail --chmod=755 entrypoint.sh /
+# Phase 2: Binary deployment
+# =========================
+FROM debian:12.2-slim
 
-ENV \
-	DA_CHAIN="/da/genesis/testnet.kate.chain.spec.raw.json" \
-	DA_NAME="AvailNode" \
-	LANG=C.UTF-8 \
-	DA_MAX_IN_PEERS=50 \
-	DA_MAX_OUT_PEERS=50 \
-	DA_P2P_PORT="30333"
+RUN apt update -y
+COPY --from=builder /da/src/data-avail /usr/local/bin/data-avail
+RUN chmod +x /usr/local/bin/data-avail
 
 # Opencontainers annotations
-LABEL \
-	org.opencontainers.image.authors="The Avail Project Team" \
+LABEL org.opencontainers.image.authors="The Avail Project Team" \
 	org.opencontainers.image.url="https://www.availproject.org/" \
 	org.opencontainers.image.documentation="https://github.com/availproject/avail-deployment#readme" \
 	org.opencontainers.image.source="https://github.com/availproject/avail-deployment" \
@@ -66,8 +40,7 @@ LABEL \
 	org.opencontainers.image.title="Avail Node" \
 	org.opencontainers.image.description="Data Availability Docker Node"
 
-# USER avail:avail
-WORKDIR /da
-VOLUME ["/tmp", "/da/state", "/da/keystore"]
-ENTRYPOINT ["/entrypoint.sh"]
+VOLUME ["/da/node-data"]
+ENTRYPOINT ["/usr/local/bin/data-avail"]
+CMD ["--chain", "goldberg", "--tmp", "--name", "MyAwesomeAvailNodeInContainer"]
 

dockerfiles/avail-node.Dockerfile

@@ -1,5 +1,4 @@
-# This is the first stage. Here we install all the dependencies that we need in order to build the Ternoa binary.
-FROM ubuntu:22.04 as builder
+FROM ubuntu:22.04
 
 ADD . ./workdir
 WORKDIR "/workdir"