feat: change image path after wacther deects changes

Author: lynoferraz

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker.io/docker/dockerfile:1.4
 ARG CM_VERSION=0.19-preview2
 ARG NONODO_VERSION=2.10.1-beta
-ARG CM_CALLER_VERSION=0.2.0
+ARG CM_CALLER_VERSION=0.2.1
 ARG TRAEFIK_VERSION=3.1.6
 ARG S6_OVERLAY_VERSION=3.2.0.2
 
@@ -95,62 +95,64 @@ ENV DATA_PATH ${DATA_PATH}
 RUN <<EOF
 mkdir -p /etc/s6-overlay/s6-rc.d/prepare-dirs
 echo "oneshot" > /etc/s6-overlay/s6-rc.d/prepare-dirs/type
-echo "
+echo "#!/command/with-contenv sh
 mkdir -p \${DATA_PATH}/db
 mkdir -p \${DATA_PATH}/advance
 mkdir -p \${DATA_PATH}/inspect
-" > /etc/s6-overlay/s6-rc.d/prepare-dirs/up
+" > /etc/s6-overlay/s6-rc.d/prepare-dirs/run.sh
+chmod +x /etc/s6-overlay/s6-rc.d/prepare-dirs/run.sh
+echo "/etc/s6-overlay/s6-rc.d/prepare-dirs/run.sh" \
+> /etc/s6-overlay/s6-rc.d/prepare-dirs/up
 mkdir -p /etc/s6-overlay/s6-rc.d/advance/dependencies.d
 touch /etc/s6-overlay/s6-rc.d/advance/dependencies.d/prepare-dirs
 echo "longrun" > /etc/s6-overlay/s6-rc.d/advance/type
-echo "#!/bin/sh
-nonodo_chain_args=
-if [ -z \"${FROM_BLOCK}\" ] && [ -z \"${RPC_URL}\" ] && [ -z \"${APP_ADDRESS}\" ]; then
-  nonodo_chain_args=\"--from-block=${FROM_BLOCK} --rpc-url=${RPC_URL} --contracts-application-address=${APP_ADDRESS}\"
-else
-  nonodo_chain_args='--anvil-port=8546'
+echo "#!/command/with-contenv sh
+nonodo_chain_args='--anvil-port=8546'
+if [ ! -z \"\${FROM_BLOCK}\" ] && [ ! -z \"\${RPC_URL}\" ] && [ ! -z \"\${APP_ADDRESS}\" ]; then
+  nonodo_chain_args=\"--from-block=\${FROM_BLOCK} --rpc-url=\${RPC_URL} --contracts-application-address=\${APP_ADDRESS}\"
 fi
 exec nonodo \
   --http-rollups-port=5004 --http-port=8080 \
-  --sqlite-file=${DATA_PATH}/db/database.sqlite \
-  ${nonodo_chain_args} \
+  --sqlite-file=\${DATA_PATH}/db/database.sqlite \
+  \${nonodo_chain_args} \
   --disable-inspect -- \
   cm-caller \
     -image=\${IMAGE_SNAPSHOT_PATH} \
-    -store-path=${DATA_PATH}/advance \
+    -store-path=\${DATA_PATH}/advance \
     -disable-inspect -disable-consistency-checks -disable-remote
 " > /etc/s6-overlay/s6-rc.d/advance/run
 mkdir -p /etc/s6-overlay/s6-rc.d/inspect/dependencies.d
 touch /etc/s6-overlay/s6-rc.d/inspect/dependencies.d/advance
 touch /etc/s6-overlay/s6-rc.d/inspect/dependencies.d/prepare-dirs
 echo "longrun" > /etc/s6-overlay/s6-rc.d/inspect/type
-echo "#!/bin/sh
+echo "#!/command/with-contenv sh
 exec nonodo \
   --http-rollups-port=5005 \
   --http-port=8081 \
   --disable-devnet --disable-advance -- \
   cm-caller \
     -image=\${IMAGE_SNAPSHOT_PATH} \
-    -store-path=${DATA_PATH}/inspect \
-    -enable-watcher -watcher-path=${DATA_PATH}/advance/latest \
+    -store-path=\${DATA_PATH}/inspect \
+    -enable-watcher -watcher-path=\${DATA_PATH}/advance/local_image \
     -disable-advance -disable-consistency-checks -disable-remote
 " > /etc/s6-overlay/s6-rc.d/inspect/run
-mkdir -p /etc/s6-overlay/s6-rc.d/traefik/dependencies.d
-touch /etc/s6-overlay/s6-rc.d/traefik/dependencies.d/advance \
-    /etc/s6-overlay/s6-rc.d/traefik/dependencies.d/inspect
+mkdir -p /etc/s6-overlay/s6-rc.d/traefik
 echo "longrun" > /etc/s6-overlay/s6-rc.d/traefik/type
 echo "#!/bin/sh
 exec traefik
 " > /etc/s6-overlay/s6-rc.d/traefik/run
 mkdir -p /etc/s6-overlay/s6-rc.d/user/contents.d
-touch /etc/s6-overlay/s6-rc.d/user/contents.d/advance \
-    /etc/s6-overlay/s6-rc.d/user/contents.d/inspect \
-    /etc/s6-overlay/s6-rc.d/user/contents.d/traefik
+touch /etc/s6-overlay/s6-rc.d/user/contents.d/traefik \
+    /etc/s6-overlay/s6-rc.d/user/contents.d/prepare-dirs \
+    /etc/s6-overlay/s6-rc.d/user/contents.d/advance \
+    /etc/s6-overlay/s6-rc.d/user/contents.d/inspect
 EOF
 
 
 FROM node-base as node
 
 USER app
 
+COPY nonodo /usr/local/bin/nonodo
+
 CMD ["/init"]

README.md

@@ -63,21 +63,26 @@ The starting snapshot was saved to `image` directory. This snapshot is used by c
 First build the node image
 
 ```shell
-mkdir node
-docker run --rm -p8080:80 -p8545:8545 -v $PWD/image:/mnt/snapshots/0 -v $PWD/node:/mnt/node cm-caller-node /init
+docker build -t cm-caller-node .
 ```
 
 Then you can go to your apps directory and start a node on the snapshot (considered as `image` here)
 
 ```shell
-mkdir node-data
+mkdir -m 777 node-data
 docker run --rm -p8080:80 -p8545:8545 -v $PWD/image:/mnt/snapshots/0 -v $PWD/node-data:/mnt/node cm-caller-node /init
 ```
 
 You can also connect to an external rpc and start the node
 
-
-
+```shell
+docker run --rm -p8080:80 --add-host host.docker.internal=host-gateway \
+    -v $PWD/image:/mnt/snapshots/0 -v $PWD/node-data:/mnt/node \
+    -e RPC_URL=<rpc url> \
+    -e APP_ADDRESS=<application contract address> \
+    -e FROM_BLOCK=<application contract deploy block> \
+    cm-caller-node /init
+```
 
 ### Build Image with the App
 

cm_caller.go

@@ -957,7 +957,8 @@ func RestartRemoteCM() error {
 	return nil
 }
 
-func StartWatcher(w *watcher.Watcher, watcherInterval uint64, pathToWatch string) error {
+func StartWatcher(w *watcher.Watcher, watcherInterval uint64, 
+		pathToWatch string, watcherDelay float64) error {
 
 	parent := filepath.Dir(pathToWatch)
 	pattern := regexp.MustCompile(filepath.Base(pathToWatch))
@@ -988,6 +989,8 @@ func StartWatcher(w *watcher.Watcher, watcherInterval uint64, pathToWatch string
 					((e.FileInfo.Mode()&os.ModeSymlink) == os.ModeSymlink &&
 					e.Op == watcher.Write)) {
 					infolog.Printf("watcher: image changed")
+					time.Sleep(time.Duration(watcherDelay * float64(time.Second)))
+					imagePath = e.Path
 
 					err := RestartRemoteCM()
 					if err != nil {
@@ -1028,6 +1031,7 @@ func StartWatcher(w *watcher.Watcher, watcherInterval uint64, pathToWatch string
 func main() {
 	var help, disableInspect, disableAdvance, resetLatestLink, enableWatcher bool
 	var watcherInterval uint64 = 1000
+	var watcherDelay float64 = 0.5
 
 	flag.StringVar(&storePath, "store-path", ".", "Path where data and images are stored")
 	flag.StringVar(&imagePath, "image", "image", "Path to the cartesi machine image")
@@ -1061,6 +1065,8 @@ func main() {
 		"Path where for the watcher watch new images (deafault: image path)")
 	flag.Uint64Var(&watcherInterval, "watcher-interval", watcherInterval, 
 		"Watcher polling interval")
+	flag.Float64Var(&watcherDelay, "watcher-delay", watcherDelay, 
+		"Delay to wait after path change")
 	flag.Uint64Var(&baseRemoteCMPort, "base-remote-port", baseRemoteCMPort, 
 		"Starting remote port")
 	flag.StringVar(&cmOutput, "remote-output", cmOutput, 
@@ -1130,7 +1136,7 @@ func main() {
 			pathToWatch = watcherPath
 		}
 
-		err = StartWatcher(w,watcherInterval,pathToWatch)
+		err = StartWatcher(w,watcherInterval,pathToWatch,watcherDelay)
 		if err != nil {
 			errorWaitGroup.Go(func() error {
 				return fmt.Errorf("start watcher error: %s", err)