tilt: better cli-gen and const-gen scope

Tiltfile

@@ -124,15 +124,17 @@ def k8s_yaml_with_ns(objects):
 
 docker_build(
     ref = "cli-gen",
-    context = ".",
-    dockerfile = "Dockerfile.cli",
+    context = "clients/js",
+    dockerfile = "clients/js/Dockerfile",
+    ignore = ["build","node_modules"],
 )
 
 docker_build(
     ref = "const-gen",
     context = ".",
     dockerfile = "Dockerfile.const",
-    build_args={"num_guardians": '%s' % (num_guardians)},
+    build_args = {"num_guardians": '%s' % (num_guardians)},
+    only = ["scripts", "ethereum/.env.test"]
 )
 
 # node

aptos/Makefile

@@ -7,6 +7,6 @@ $(TARGETS):
 	$(foreach dir,$(CONTRACT_DIRS), make -C $(dir) $@ &&) true
 
 test-docker:
-	DOCKER_BUILDKIT=1 docker build --progress plain  -f ../Dockerfile.cli -t cli-gen ..
+	DOCKER_BUILDKIT=1 docker build --progress plain  -f ../clients/js/Dockerfile -t cli-gen ../clients/js
 	DOCKER_BUILDKIT=1 docker build --build-arg num_guardians=1 --progress plain  -f ../Dockerfile.const -t const-gen ..
 	DOCKER_BUILDKIT=1 docker build --progress plain  -f Dockerfile --target tests .

clients/js/.dockerignore

@@ -0,0 +1,2 @@
+build
+node_modules

Dockerfile.cli → clients/js/Dockerfile

@@ -2,14 +2,14 @@
 FROM node:18-alpine@sha256:44aaf1ccc80eaed6572a0f2ef7d6b5a2982d54481e4255480041ac92221e2f11 as cli-build
 
 # Copy package.json & package-lock.json by themselves to create a cache layer
-COPY clients/js/package.json clients/js/package-lock.json /clients/js/
+COPY package.json package-lock.json /clients/js/
 
 WORKDIR /clients/js
 
 RUN npm ci
 
 # Copy the rest of the source files, as a layer on top of the deps
-COPY clients/js /clients/js
+COPY . /clients/js
 
 # Build CLI
 RUN npm run build

sui/Makefile

@@ -10,6 +10,6 @@ test:
 	$(foreach dir,$(TEST_CONTRACT_DIRS), make -C $(dir) $@ &&) true
 
 test-docker:
-	DOCKER_BUILDKIT=1 docker build --progress plain  -f ../Dockerfile.cli -t cli-gen ..
+	DOCKER_BUILDKIT=1 docker build --progress plain  -f ../clients/js/Dockerfile -t cli-gen ../clients/js
 	DOCKER_BUILDKIT=1 docker build --build-arg num_guardians=1 --progress plain -f ../Dockerfile.const -t const-gen ..
 	DOCKER_BUILDKIT=1 docker build -f Dockerfile ..