[Dockerfile][Experimental] Remove cargo-chef and sequence builds

docker/experimental/builder.Dockerfile

@@ -17,18 +17,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         binutils \
         lld
 
-# install cargo chef to cache dependencies
-RUN --mount=type=cache,target=/root/.cargo <<EOT
-    cargo install [email protected]
-    cargo install cargo-cache --no-default-features --features ci-autoclean
-EOT
-
-### Build Rust dependencies ###
-FROM rust-base as planner
-
-COPY --link . .
-RUN cargo chef prepare --recipe-path recipe.json
-
 ### Build Rust code ###
 FROM rust-base as builder-base
 
@@ -52,15 +40,6 @@ RUN ARCHITECTURE=$(uname -m | sed -e "s/arm64/arm_64/g" | sed -e "s/aarch64/aarc
     && chmod +x "/usr/local/bin/protoc" \
     && rm "protoc-21.5-linux-$ARCHITECTURE.zip"
 
-# Use cargo chef
-COPY  --link --from=planner /aptos/recipe.json recipe.json
-
-# Build dependencies - this is the caching Docker layer!
-RUN <<EOT
-    cargo chef cook --profile ${PROFILE} --workspace --recipe-path recipe.json
-    cargo cache
-EOT
-
 COPY --link . /aptos/
 
 FROM builder-base as aptos-node-builder

docker/experimental/debian-base.Dockerfile

@@ -5,6 +5,5 @@ FROM debian AS debian-base
 RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 
 # Add Tini to make sure the binaries receive proper SIGTERM signals when Docker is shut down
-ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini
-RUN chmod +x /tini
+ADD --chmod=755 https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini
 ENTRYPOINT ["/tini", "--"]

docker/experimental/docker-bake-rust-all.hcl

@@ -52,6 +52,10 @@ group "forge-images" {
   targets = ["validator-testing", "tools", "forge"]
 }
 
+group "build" {
+  targets = ["aptos-node-builder", "tools-builder"]
+}
+
 target "debian-base" {
   dockerfile = "docker/experimental/debian-base.Dockerfile"
   context = "."

docker/experimental/docker-bake-rust-all.sh

@@ -46,6 +46,8 @@ fi
 
 BUILD_TARGET="${1:-forge-images}"
 if [ "$CI" == "true" ]; then
+  TARGET_REGISTRY=remote docker buildx bake --progress=plain --file docker/experimental/docker-bake-rust-all.hcl builder-base
+  TARGET_REGISTRY=remote docker buildx bake --progress=plain --file docker/experimental/docker-bake-rust-all.hcl build
   TARGET_REGISTRY=remote docker buildx bake --progress=plain --file docker/experimental/docker-bake-rust-all.hcl --push $BUILD_TARGET
 else
   TARGET_REGISTRY=local docker buildx bake --file docker/experimental/docker-bake-rust-all.hcl $BUILD_TARGET --load