Merge pull request #283 from ayuryshev/bug/fix-skywire-cli-282

Fix skywire-cli. Update Makefile
skycoin · Apr 12, 2019 · a70894c · a70894c
2 parents 6ca446b + 263ba5c
commit a70894c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -108,7 +108,7 @@ docker-bin: ## Build `skywire-node`, `skywire-cli`, `manager-node`, `therealssh-
 	${DOCKER_OPTS} go build -o ./node/skywire-node ./cmd/skywire-node 
 
 docker-volume: docker-apps docker-bin bin  ## Prepare docker volume for dockerized skywire-node	
-	./skywire-cli config ./node/skywire.json
+	./skywire-cli node gen-config  -o ./node/skywire.json -r
 
 docker-run: docker-clean docker-image docker-network docker-volume ## Run dockerized skywire-node ${DOCKER_NODE} in image ${DOCKER_IMAGE} with network ${DOCKER_NETWORK}
 	docker run -it -v $(shell pwd)/node:/sky --network=${DOCKER_NETWORK} \

diff --git a/cmd/skywire-node/commands/root.go b/cmd/skywire-node/commands/root.go
@@ -65,6 +65,7 @@ var rootCmd = &cobra.Command{
 			}
 		}
 	},
+	Version: node.Version,
 }
 
 // Execute executes root CLI command.

diff --git a/cmd/skywire-node/commands/version.go b/cmd/skywire-node/commands/version.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ var rootCmd = &cobra.Command{ @@
     			}
     		}
     	},
+    	Version: node.Version,
     }
     // Execute executes root CLI command.
@@ Expand Down @@