Skip to content

Commit 755ab42

Browse files
tok-kkktok-kkk
committed
Merge branch 'master' into feat/CI
2 parents d235ca3 + 2417a37 commit 755ab42

File tree

9 files changed

+23
-22
lines changed

9 files changed

+23
-22
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ commands:
2929
- run:
3030
name: Publish release to github
3131
command: |
32-
wget https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz
32+
wget https://www.github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz
3333
tar xvzf ghr_v0.13.0_linux_amd64.tar.gz
3434
mv ghr_v0.13.0_linux_amd64/ghr ghr
3535
./ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -soft $(cat ./VERSION) ./artifacts/

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To jump straight into running your first Darknode on AWS, checkout our [Getting
1010

1111
## Getting Started on Digital Ocean
1212

13-
Checkout the instructions for [Creating a Personal Access Token](https://github.com/renproject/darknode-cli#digital-ocean) on Digital Ocean.
13+
Checkout the instructions for [Creating a Personal Access Token](https://www.github.com/renproject/darknode-cli#digital-ocean) on Digital Ocean.
1414

1515

1616
## Installing the tool

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.13
1+
3.0.14

‎cmd/flag.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ var (
4040
Name: "version",
4141
Usage: "Version of darknode you want to upgrade to",
4242
}
43-
DowngradeFlag = cli.BoolFlag{
44-
Name: "downgrade",
45-
Usage: "Force downgrading to an older version without interactive prompts",
43+
ForceUpdateFlag = cli.BoolFlag{
44+
Name: "force, f",
45+
Usage: "Force updating to an older version without interactive prompts",
4646
}
4747
)
4848

‎cmd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func main() {
6868
{
6969
Name: "update",
7070
Usage: "Update your Darknodes to the latest software and configuration",
71-
Flags: []cli.Flag{TagsFlag, VersionFlag, DowngradeFlag},
71+
Flags: []cli.Flag{TagsFlag, VersionFlag, ForceUpdateFlag},
7272
Action: func(c *cli.Context) error {
7373
return updateNode(c)
7474
},

‎cmd/provider/aws_template.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ resource "aws_instance" "darknode" {
126126
"sudo DEBIAN_FRONTEND=noninteractive apt-get -y upgrade",
127127
"sudo DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade",
128128
"sudo DEBIAN_FRONTEND=noninteractive apt-get -y autoremove",
129-
"sudo apt-get -y install jq",
130129
"sudo apt-get install ufw",
131130
"sudo ufw limit 22/tcp",
132131
"sudo ufw allow 18514/tcp",
@@ -162,7 +161,7 @@ resource "aws_instance" "darknode" {
162161
"mkdir -p $HOME/.darknode/bin",
163162
"mkdir -p $HOME/.config/systemd/user",
164163
"mv $HOME/config.json $HOME/.darknode/config.json",
165-
"curl -sL https://www.github.com/renproject/darknode-release/releases/latest/download/darknode > ~/.darknode/bin/darknode",
164+
"curl -sL https://www.github.com/renproject/darknode-release/releases/download/{{.LatestVersion}}/darknode > ~/.darknode/bin/darknode",
166165
"chmod +x ~/.darknode/bin/darknode",
167166
"echo {{.LatestVersion}} > ~/.darknode/version",
168167
<<EOT

‎cmd/provider/do_template.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ resource "digitalocean_droplet" "darknode" {
8282
"sudo ufw allow 18514/tcp",
8383
"sudo ufw allow 18515/tcp",
8484
"sudo ufw --force enable",
85-
"until sudo apt-get -y install jq; do sleep 4; done",
8685
]
8786
8887
connection {
@@ -113,7 +112,7 @@ resource "digitalocean_droplet" "darknode" {
113112
"mkdir -p $HOME/.darknode/bin",
114113
"mkdir -p $HOME/.config/systemd/user",
115114
"mv $HOME/config.json $HOME/.darknode/config.json",
116-
"curl -sL https://www.github.com/renproject/darknode-release/releases/latest/download/darknode > ~/.darknode/bin/darknode",
115+
"curl -sL https://www.github.com/renproject/darknode-release/releases/download/{{.LatestVersion}}/darknode > ~/.darknode/bin/darknode",
117116
"chmod +x ~/.darknode/bin/darknode",
118117
"echo {{.LatestVersion}} > ~/.darknode/version",
119118
<<EOT

‎cmd/provider/gcp_template.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ resource "google_compute_instance" "darknode" {
128128
"sudo ufw allow 18514/tcp",
129129
"sudo ufw allow 18515/tcp",
130130
"sudo ufw --force enable",
131-
"until sudo apt-get -y install jq; do sleep 4; done",
132131
]
133132
134133
connection {
@@ -159,7 +158,7 @@ resource "google_compute_instance" "darknode" {
159158
"mkdir -p $HOME/.darknode/bin",
160159
"mkdir -p $HOME/.config/systemd/user",
161160
"mv $HOME/config.json $HOME/.darknode/config.json",
162-
"curl -sL https://www.github.com/renproject/darknode-release/releases/latest/download/darknode > ~/.darknode/bin/darknode",
161+
"curl -sL https://www.github.com/renproject/darknode-release/releases/download/{{.LatestVersion}}/darknode > ~/.darknode/bin/darknode",
163162
"chmod +x ~/.darknode/bin/darknode",
164163
"echo {{.LatestVersion}} > ~/.darknode/version",
165164
<<EOT

‎cmd/update.go

+13-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
func updateNode(ctx *cli.Context) error {
2222
name := ctx.Args().First()
2323
tags := ctx.String("tags")
24-
force := ctx.Bool("downgrade")
24+
force := ctx.Bool("force")
2525
version := strings.TrimSpace(ctx.String("version"))
2626
nodes, err := util.ParseNodesFromNameAndTags(name, tags)
2727
if err != nil {
@@ -60,7 +60,15 @@ func updateSingleNode(name, ver string, force bool) error {
6060
res := curVersion.Compare(newVersion)
6161
switch res {
6262
case 0:
63-
color.Green("darknode [%v] is running version [%v] already.", name, ver)
63+
if !force {
64+
color.Green("darknode [%v] is running version [%v] already.", name, ver)
65+
return nil
66+
}
67+
if err := update(name, ver); err != nil {
68+
color.Red("cannot update darknode %v, error = %v", name, err)
69+
} else {
70+
color.Green("[%s] has been updated to version %v", name, ver)
71+
}
6472
case 1:
6573
if !force {
6674
color.Red("darknode [%v] is running with version %v, you cannot downgrade to a lower version %v", name, curVersion.String(), newVersion.String())
@@ -82,14 +90,10 @@ func updateSingleNode(name, ver string, force bool) error {
8290
}
8391

8492
func update(name, ver string) error {
85-
url := fmt.Sprintf("https://github.com/renproject/darknode-release/releases/download/%v", ver)
86-
script := fmt.Sprintf(`mv ~/.darknode/bin/darknode ~/.darknode/bin/darknode-backup &&
87-
curl -sL %v/darknode > ~/.darknode/bin/darknode &&
93+
url := fmt.Sprintf("https://www.github.com/renproject/darknode-release/releases/download/%v", ver)
94+
script := fmt.Sprintf(`curl -sL %v/darknode > ~/.darknode/bin/darknode-new &&
95+
mv ~/.darknode/bin/darknode-new ~/.darknode/bin/darknode &&
8896
chmod +x ~/.darknode/bin/darknode &&
89-
systemctl --user stop darknode &&
90-
cp -a ~/.darknode/db/. ~/.darknode/db_bak/ &&
91-
rm -rf ~/.darknode/db &&
92-
mv ~/.darknode/db_bak ~/.darknode/db &&
9397
echo %v > ~/.darknode/version &&
9498
systemctl --user restart darknode`, url, ver)
9599
return util.RemoteRun(name, script)

0 commit comments

Comments
 (0)