diff --git a/.circleci/config.yml b/.circleci/config.yml index 8301dc2b..0d1de07b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ commands: - run: name: Publish release to github command: | - wget https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz + wget https://www.github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz tar xvzf ghr_v0.13.0_linux_amd64.tar.gz mv ghr_v0.13.0_linux_amd64/ghr ghr ./ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -soft $(cat ./VERSION) ./artifacts/ diff --git a/README.md b/README.md index 35122111..8a6c053a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ To jump straight into running your first Darknode on AWS, checkout our [Getting ## Getting Started on Digital Ocean -Checkout the instructions for [Creating a Personal Access Token](https://github.com/renproject/darknode-cli#digital-ocean) on Digital Ocean. +Checkout the instructions for [Creating a Personal Access Token](https://www.github.com/renproject/darknode-cli#digital-ocean) on Digital Ocean. ## Installing the tool diff --git a/VERSION b/VERSION index 9c25f93c..513cc0b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.13 \ No newline at end of file +3.0.14 \ No newline at end of file diff --git a/cmd/flag.go b/cmd/flag.go index a9384ce3..75b66835 100644 --- a/cmd/flag.go +++ b/cmd/flag.go @@ -40,9 +40,9 @@ var ( Name: "version", Usage: "Version of darknode you want to upgrade to", } - DowngradeFlag = cli.BoolFlag{ - Name: "downgrade", - Usage: "Force downgrading to an older version without interactive prompts", + ForceUpdateFlag = cli.BoolFlag{ + Name: "force, f", + Usage: "Force updating to an older version without interactive prompts", } ) diff --git a/cmd/main.go b/cmd/main.go index 69db88ff..e4e7d74f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -68,7 +68,7 @@ func main() { { Name: "update", Usage: "Update your Darknodes to the latest software and configuration", - Flags: []cli.Flag{TagsFlag, VersionFlag, DowngradeFlag}, + Flags: []cli.Flag{TagsFlag, VersionFlag, ForceUpdateFlag}, Action: func(c *cli.Context) error { return updateNode(c) }, diff --git a/cmd/provider/aws_template.go b/cmd/provider/aws_template.go index 49644666..d70a29bd 100644 --- a/cmd/provider/aws_template.go +++ b/cmd/provider/aws_template.go @@ -126,7 +126,6 @@ resource "aws_instance" "darknode" { "sudo DEBIAN_FRONTEND=noninteractive apt-get -y upgrade", "sudo DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade", "sudo DEBIAN_FRONTEND=noninteractive apt-get -y autoremove", - "sudo apt-get -y install jq", "sudo apt-get install ufw", "sudo ufw limit 22/tcp", "sudo ufw allow 18514/tcp", @@ -162,7 +161,7 @@ resource "aws_instance" "darknode" { "mkdir -p $HOME/.darknode/bin", "mkdir -p $HOME/.config/systemd/user", "mv $HOME/config.json $HOME/.darknode/config.json", - "curl -sL https://www.github.com/renproject/darknode-release/releases/latest/download/darknode > ~/.darknode/bin/darknode", + "curl -sL https://www.github.com/renproject/darknode-release/releases/download/{{.LatestVersion}}/darknode > ~/.darknode/bin/darknode", "chmod +x ~/.darknode/bin/darknode", "echo {{.LatestVersion}} > ~/.darknode/version", < ~/.darknode/bin/darknode", + "curl -sL https://www.github.com/renproject/darknode-release/releases/download/{{.LatestVersion}}/darknode > ~/.darknode/bin/darknode", "chmod +x ~/.darknode/bin/darknode", "echo {{.LatestVersion}} > ~/.darknode/version", < ~/.darknode/bin/darknode", + "curl -sL https://www.github.com/renproject/darknode-release/releases/download/{{.LatestVersion}}/darknode > ~/.darknode/bin/darknode", "chmod +x ~/.darknode/bin/darknode", "echo {{.LatestVersion}} > ~/.darknode/version", < ~/.darknode/bin/darknode && + url := fmt.Sprintf("https://www.github.com/renproject/darknode-release/releases/download/%v", ver) + script := fmt.Sprintf(`curl -sL %v/darknode > ~/.darknode/bin/darknode-new && +mv ~/.darknode/bin/darknode-new ~/.darknode/bin/darknode && chmod +x ~/.darknode/bin/darknode && -systemctl --user stop darknode && -cp -a ~/.darknode/db/. ~/.darknode/db_bak/ && -rm -rf ~/.darknode/db && -mv ~/.darknode/db_bak ~/.darknode/db && echo %v > ~/.darknode/version && systemctl --user restart darknode`, url, ver) return util.RemoteRun(name, script)