Merge branch 'main' into contribute-highlights

aptos-labs · Mar 3, 2023 · ee9bbf8 · ee9bbf8
2 parents c81e173 + 08334bc
commit ee9bbf8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/developer-docs-site/docs/nodes/node-files-all-networks/node-files.md b/developer-docs-site/docs/nodes/node-files-all-networks/node-files.md
@@ -91,7 +91,7 @@ Fullnode means either a validator fullnode or a public fullnode.
 - **Git branch:** `mainnet` on https://github.com/aptos-labs/aptos-core
 - **Command to download:**
   ```bash
-  wget -O docker-compose.yaml https://raw.githubusercontent.com/aptos-labs/aptos-core/mainnet/docker/compose/aptos-node/docker-compose-fullnode.yaml
+  wget -O docker-compose-fullnode.yaml https://raw.githubusercontent.com/aptos-labs/aptos-core/mainnet/docker/compose/aptos-node/docker-compose-fullnode.yaml
   ```
 
 ## fullnode.yaml (fullnode only)

diff --git a/docker/experimental/builder.Dockerfile b/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

diff --git a/docker/experimental/debian-base.Dockerfile b/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", "--"]
diff --git a/docker/experimental/docker-bake-rust-all.hcl b/docker/experimental/docker-bake-rust-all.hcl
@@ -54,7 +54,6 @@ group "forge-images" {
 
 target "debian-base" {
   dockerfile = "docker/experimental/debian-base.Dockerfile"
-  context = "."
   contexts = {
     debian = "docker-image://debian:bullseye-20220912@sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9"
   }
@@ -81,7 +80,6 @@ target "builder-base" {
 target "aptos-node-builder" {
   dockerfile = "docker/experimental/builder.Dockerfile"
   target = "aptos-node-builder"
-  context = "."
   contexts = {
     rust = "docker-image://rust:1.64.0-bullseye@sha256:5cf09a76cb9baf4990d121221bbad64927cc5690ee54f246487e302ddc2ba300"
     builder-base = "target:builder-base"
@@ -100,7 +98,6 @@ target "aptos-node-builder" {
 target "tools-builder" {
   dockerfile = "docker/experimental/builder.Dockerfile"
   target = "tools-builder"
-  context = "."
   contexts = {
     rust = "docker-image://rust:1.64.0-bullseye@sha256:5cf09a76cb9baf4990d121221bbad64927cc5690ee54f246487e302ddc2ba300"
     builder-base =  "target:builder-base"