From 9598186ced5bbf5b6bd2509c6afa1ee661dfaafc Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Thu, 4 Jan 2024 15:06:35 +0400 Subject: [PATCH] Squashed commit of the following: commit 78c8d233032b97dd8a80f8f61fac98c7df21d87d Author: wanwiset25 Date: Wed Dec 20 15:39:23 2023 +0400 puppeth exit with error code when fails commit ef0be6666040c9dfdae958b418b8b32c4284b6da Author: wanwiset25 Date: Wed Dec 20 15:25:03 2023 +0400 dockerfile commit 51bc92a2fccc947f1349f0a125080adb1d2d294a Author: wanwiset25 Date: Tue Dec 19 15:04:33 2023 +0400 add puppeth script --- cmd/puppeth/wizard_genesis_file.go | 2 ++ docker/Dockerfile | 1 + docker/puppeth.sh | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 docker/puppeth.sh diff --git a/cmd/puppeth/wizard_genesis_file.go b/cmd/puppeth/wizard_genesis_file.go index 97c32cb4e..7ed08f416 100644 --- a/cmd/puppeth/wizard_genesis_file.go +++ b/cmd/puppeth/wizard_genesis_file.go @@ -99,12 +99,14 @@ func (w *wizard) makeGenesisFile() { configFile, err := ioutil.ReadFile(w.options.filePath) if err != nil { fmt.Println("read file error ", err) + os.Exit(1) return } var input = NewGenesisInput() // Unmarshal our input YAML file if err := yaml.Unmarshal(configFile, &input); err != nil { fmt.Println("parse YAML error ", err) + os.Exit(1) return } SetDefaultAfterInputRead(input) diff --git a/docker/Dockerfile b/docker/Dockerfile index cc6551110..2a1418ec1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,6 +25,7 @@ RUN chmod +x /usr/bin/puppeth # Copy over files ADD docker/start.sh /work/start.sh ADD docker/start-bootnode.sh /work/start-bootnode.sh +ADD docker/puppeth.sh /work/puppeth.sh # Create an empty pwd file RUN touch /work/.pwd diff --git a/docker/puppeth.sh b/docker/puppeth.sh new file mode 100644 index 000000000..def1ea962 --- /dev/null +++ b/docker/puppeth.sh @@ -0,0 +1,2 @@ +#!/bin/bash +puppeth --file /app/generated/genesis_input.yml --out /app/generated/ \ No newline at end of file