From aa2fe9de2cae42760786dc77d9612b9d0ef374c1 Mon Sep 17 00:00:00 2001
From: matt <xbtmatt@gmail.com>
Date: Thu, 5 Sep 2024 15:47:16 -0700
Subject: [PATCH] * Update and explani skip fetch latest git deps in publish
 command

* Remove things that are in the base image now
---
 src/docker/local-deployer/Dockerfile            | 12 ------------
 .../local-deployer/sh/build-publish-payloads.sh | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/docker/local-deployer/Dockerfile b/src/docker/local-deployer/Dockerfile
index e84d7b330..362ad4496 100644
--- a/src/docker/local-deployer/Dockerfile
+++ b/src/docker/local-deployer/Dockerfile
@@ -1,9 +1,5 @@
 FROM econialabs/aptos-cli:4.1.0 AS aptos-cli
 
-FROM ubuntu:noble
-
-COPY --from=aptos-cli /usr/local/bin/aptos /usr/local/bin/aptos
-
 ARG PUBLISHER_PRIVATE_KEY \
     EMOJICOIN_MODULE_ADDRESS
 ENV PUBLISHER_PRIVATE_KEY=${PUBLISHER_PRIVATE_KEY} \
@@ -11,14 +7,6 @@ ENV PUBLISHER_PRIVATE_KEY=${PUBLISHER_PRIVATE_KEY} \
 
 WORKDIR /app
 
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        ca-certificates \
-        git=1:2.43* \
-        curl=8.5* \
-        jq=1.7* \
-    && rm -rf /var/lib/apt/lists/*
-
 ARG emojicoin_dir=src/move/emojicoin_dot_fun
 ARG rewards_dir=src/move/rewards
 COPY ${emojicoin_dir} move/emojicoin_dot_fun
diff --git a/src/docker/local-deployer/sh/build-publish-payloads.sh b/src/docker/local-deployer/sh/build-publish-payloads.sh
index fc79e4a8e..8e24425e7 100644
--- a/src/docker/local-deployer/sh/build-publish-payloads.sh
+++ b/src/docker/local-deployer/sh/build-publish-payloads.sh
@@ -11,18 +11,21 @@ address=$EMOJICOIN_MODULE_ADDRESS
 
 aptos move build-publish-payload \
 	--assume-yes \
-	--named-addresses \
-        rewards=$address,integrator=$address,emojicoin_dot_fun=$address \
+	--named-addresses emojicoin_dot_fun=$address \
 	--override-size-check \
 	--included-artifacts none \
-	--package-dir $move_dir/rewards/ \
-	--json-output-file $json_dir/rewards.json
+	--package-dir $move_dir/emojicoin_dot_fun/ \
+	--json-output-file $json_dir/emojicoin_dot_fun.json \
 
+# Note the extra `--skip-fetch-latest-git-deps` flag because the previous
+# command already fetches the latest git dependencies and the `rewards` module's
+# dependencies are a subset of the dependencies for `emojicoin_dot_fun`.
 aptos move build-publish-payload \
 	--assume-yes \
-	--named-addresses emojicoin_dot_fun=$address \
+	--named-addresses \
+        rewards=$address,integrator=$address,emojicoin_dot_fun=$address \
 	--override-size-check \
 	--included-artifacts none \
-	--package-dir $move_dir/emojicoin_dot_fun/ \
-	--json-output-file $json_dir/emojicoin_dot_fun.json \
+	--package-dir $move_dir/rewards/ \
+	--json-output-file $json_dir/rewards.json \
 	--skip-fetch-latest-git-deps