From 29b42db0b7021d95e460227fb66d524ab66c9ba7 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 18 Sep 2025 15:50:43 +0200 Subject: [PATCH 1/6] Scripts/Docker: remove endorser --- scripts/docker/entrypoint.inc.sh | 19 ------------------- scripts/docker/entrypoint.sh | 7 ------- 2 files changed, 26 deletions(-) diff --git a/scripts/docker/entrypoint.inc.sh b/scripts/docker/entrypoint.inc.sh index 9ff1d95fffd9..226dc512cd40 100644 --- a/scripts/docker/entrypoint.inc.sh +++ b/scripts/docker/entrypoint.inc.sh @@ -5,7 +5,6 @@ node=${node:?} client=${client:?} admin_client=${admin_client:?} baker=${baker:?} -endorser=${endorser:?} accuser=${accuser:?} signer=${signer:?} smart_rollup_node=${smart_rollup_node:?} @@ -186,24 +185,6 @@ launch_baker_test() { run with local node "$node_data_dir" "$@" } -launch_endorser() { - configure_client - wait_for_the_node_to_be_bootstrapped - exec "$endorser" --chain main \ - --base-dir "$client_dir" \ - --endpoint "http://$NODE_HOST:$NODE_RPC_PORT" \ - run "$@" -} - -launch_endorser_test() { - configure_client - wait_for_the_node_to_be_bootstrapped - exec "$endorser" --chain test \ - --base-dir "$client_dir" \ - --endpoint "http://$NODE_HOST:$NODE_RPC_PORT" \ - run "$@" -} - launch_accuser() { configure_client wait_for_the_node_to_be_bootstrapped diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh index 31579eed9750..2e28efb72d33 100755 --- a/scripts/docker/entrypoint.sh +++ b/scripts/docker/entrypoint.sh @@ -21,7 +21,6 @@ export node="$BIN_DIR/octez-node" export client="$BIN_DIR/octez-client" export admin_client="$BIN_DIR/octez-admin-client" export baker="$BIN_DIR/octez-baker-$PROTOCOL" -export endorser="$BIN_DIR/octez-endorser-$PROTOCOL" export accuser="$BIN_DIR/octez-accuser-$PROTOCOL" export signer="$BIN_DIR/octez-signer" export smart_rollup_node="$BIN_DIR/octez-smart-rollup-node" @@ -53,12 +52,6 @@ octez-baker) octez-baker-test) launch_baker_test "$@" ;; -octez-endorser) - launch_endorser "$@" - ;; -octez-endorser-test) - launch_endorser_test "$@" - ;; octez-accuser) launch_accuser "$@" ;; -- GitLab From c8dfe7373037cf10999faa834343bb7cf8f3251a Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 18 Sep 2025 15:50:59 +0200 Subject: [PATCH 2/6] Scripts/Docker: remove manual generate identity --- scripts/docker/entrypoint.inc.sh | 8 -------- scripts/docker/entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/docker/entrypoint.inc.sh b/scripts/docker/entrypoint.inc.sh index 226dc512cd40..66a3b204a43d 100644 --- a/scripts/docker/entrypoint.inc.sh +++ b/scripts/docker/entrypoint.inc.sh @@ -136,14 +136,6 @@ launch_node() { if [ "$i" = "--help" ]; then exit 0; fi done - # Generate a new identity if not present - - if [ ! -f "$node_data_dir/identity.json" ]; then - echo "Generating a new node identity..." - "$node" identity generate "${IDENTITY_POW:-26}". \ - --data-dir "$node_data_dir" - fi - configure_client # Launching the node diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh index 2e28efb72d33..c6ef942c3409 100755 --- a/scripts/docker/entrypoint.sh +++ b/scripts/docker/entrypoint.sh @@ -87,7 +87,7 @@ You can specify the network with argument --network, for instance: Daemons: - octez-node [args] - Initialize a new identity and run the octez node. + Run the octez node. - octez-smart-rollup-node [args] Run the octez smart rollup node. -- GitLab From daabcfbba0d6929a77f013c1ce5cf30c385b20e3 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 18 Sep 2025 15:51:31 +0200 Subject: [PATCH 3/6] Scripts/Docker: the rollup node is smart --- scripts/docker/entrypoint.inc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/entrypoint.inc.sh b/scripts/docker/entrypoint.inc.sh index 66a3b204a43d..acc90841f163 100644 --- a/scripts/docker/entrypoint.inc.sh +++ b/scripts/docker/entrypoint.inc.sh @@ -198,7 +198,7 @@ launch_smart_rollup_node() { configure_client if [ ! -f "$smart_rollup_node_data_dir/config.json" ]; then - echo "Configuring the rollup node..." + echo "Configuring the smart rollup node..." "$smart_rollup_node" init observer config \ for "$SOR_ALIAS_OR_ADDR" \ with operators \ -- GitLab From 9ded8e78ff9544363767899f576145e7d248f2e4 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 18 Sep 2025 15:51:40 +0200 Subject: [PATCH 4/6] Scripts/Docker: mainnet network instead of carthagenet --- scripts/docker/entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh index c6ef942c3409..9379bd5f5315 100755 --- a/scripts/docker/entrypoint.sh +++ b/scripts/docker/entrypoint.sh @@ -82,8 +82,7 @@ entrypoint using --entrypoint . All binaries are in $BIN_DIR and the tezos data in $DATA_DIR You can specify the network with argument --network, for instance: - --network carthagenet -(default is mainnet). + --network mainnet Daemons: - octez-node [args] -- GitLab From aa1da6dc9a0d5f7ae70bca15fc2e702fb03bdc53 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 18 Sep 2025 16:30:38 +0200 Subject: [PATCH 5/6] Scripts/Docker: use agnostic baker by default --- scripts/docker/entrypoint.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh index 9379bd5f5315..fedadfee542e 100755 --- a/scripts/docker/entrypoint.sh +++ b/scripts/docker/entrypoint.sh @@ -14,14 +14,18 @@ bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")" # outside world. : "${NODE_RPC_ADDR:="[::]"}" -: "${PROTOCOL:="unspecified-PROTOCOL-variable"}" - # export all these variables to be used in the inc script export node="$BIN_DIR/octez-node" export client="$BIN_DIR/octez-client" export admin_client="$BIN_DIR/octez-admin-client" -export baker="$BIN_DIR/octez-baker-$PROTOCOL" -export accuser="$BIN_DIR/octez-accuser-$PROTOCOL" +# Set default only if PROTOCOL is unset or empty +if [ -z "$PROTOCOL" ]; then + export baker="$BIN_DIR/octez-baker" + export accuser="$BIN_DIR/octez-accuser" +else + export baker="$BIN_DIR/octez-baker-$PROTOCOL" + export accuser="$BIN_DIR/octez-accuser-$PROTOCOL" +fi export signer="$BIN_DIR/octez-signer" export smart_rollup_node="$BIN_DIR/octez-smart-rollup-node" -- GitLab From 8d1ebd474268db63c2c67931fea24fa69b1bd1ea Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 18 Sep 2025 16:31:59 +0200 Subject: [PATCH 6/6] Scripts/Docker: update the documentation --- docs/introduction/howtoget.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/introduction/howtoget.rst b/docs/introduction/howtoget.rst index d6f2f94f1003..d6666a50a3eb 100644 --- a/docs/introduction/howtoget.rst +++ b/docs/introduction/howtoget.rst @@ -418,7 +418,8 @@ environment variables: - ``NODE_HOST``: The name of the node container (defaults to ``node``). - ``NODE_RPC_PORT``: The RPC port **inside the container** the node listens to (defaults to ``8732``). - ``NODE_RPC_ADDR``: The RPC address **inside the container** the node binds to (defaults to ``[::]``). -- ``PROTOCOL``: The protocol used. +- ``PROTOCOL``: The protocol used (if the protocol is not provided, + ``octez-baker`` and ``octez-accuser`` will be used). These variables can be set in the docker-compose file, as demonstrated in :src:`scripts/docker/alpha.yml`:: -- GitLab