build aptos devnet

.github/workflows/docker.yaml

@@ -10,7 +10,7 @@ on:
       - main
 
 env:
-  APTOS_GIT_REVISION: ee0d090   # devnet branch
+  APTOS_GIT_REVISION: 7dc7078
 
 concurrency: docker
 

Dockerfile

@@ -14,6 +14,8 @@ RUN git clone https://github.com/aptos-labs/aptos-core.git . && \
 RUN ./scripts/dev_setup.sh -t -b -p
 RUN source ~/.profile && \
     cargo build --locked --release --bin aptos
+RUN source ~/.profile && \
+    cargo build --locked --release --package aptos-node
 
 FROM ubuntu:22.04 AS base
 
@@ -36,7 +38,20 @@ COPY --from=builder \
 USER aptos
 WORKDIR /aptos
 
+FROM base AS aptos-node
+
+COPY --from=builder \
+    /usr/src/aptos/target/release/aptos-node \
+    /usr/local/bin/
+
+COPY --from=builder \
+    /usr/lib/* \
+    /usr/lib/
+
+USER aptos
+WORKDIR /aptos
+
 EXPOSE 8080
 EXPOSE 9102
 
-ENTRYPOINT ["aptos", "node", "run-local-testnet"]
+ENTRYPOINT ["aptos-node"]

docker-bake.hcl

@@ -24,31 +24,45 @@ function "cache_multi_platform" {
 
 # Single-platform targets.
 # Requires creating multi-platform manifest list manually.
-target "aptos" {
+target "aptos-node" {
   platforms = [PLATFORM]
-  target = "aptos"
+  target = "aptos-node"
   output = ["type=image"]
   args = {
     APTOS_GIT_REVISION = APTOS_GIT_REVISION
   }
+  tags = tags("aptos-node")
+  cache-from = [cache("aptos-node")] # always merged with children's cache-from
+  cache-to = ["${cache("aptos-node")},mode=max"]
+}
+
+target "aptos" {
+  inherits = ["aptos-node"]
+  target = "aptos"
   tags = tags("aptos")
-  cache-from = [cache("aptos")] # always merged with children's cache-from
-  cache-to = ["${cache("aptos")},mode=max"]
+  # Sharing the same cache with aptos-node
 }
 
 target "default" {
-  inherits = ["aptos"]
+  inherits = ["aptos-node"]
 }
 
 # Multi-platform targets.
-target "aptos-multi-platform" {
+target "aptos-node-multi-platform" {
   platforms = ["linux/amd64", "linux/arm64"]
-  target = "aptos"
+  target = "aptos-node"
   output = ["type=image"]
   args = {
     APTOS_GIT_REVISION = APTOS_GIT_REVISION
   }
+  tags = tags_multi_platform("aptos-node")
+  cache-from = [cache_multi_platform("aptos-node")] # always merged with children's cache-from
+  cache-to = ["${cache_multi_platform("aptos-node")},mode=max"]
+}
+
+target "aptos-multi-platform" {
+  inherits = ["aptos-node-multi-platform"]
+  target = "aptos"
   tags = tags_multi_platform("aptos")
-  cache-from = [cache_multi_platform("aptos")] # always merged with children's cache-from
-  cache-to = ["${cache_multi_platform("aptos")},mode=max"]
+  # Sharing the same cache with aptos-node
 }