Skip to content

Commit 1469384

Browse files
QuentinBrossejerome-quere
QuentinBrosse
authored and
jerome-quere
committed
doc: update to new instances and images (#569)
1 parent 848b7a5 commit 1469384

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ Options:
323323

324324
--boot-type=auto Choose between 'local' and 'bootscript' boot
325325
--bootscript="" Assign a bootscript
326-
--commercial-type=DEV1-S Create a server with specific commercial-type C1, C2[S|M|L], X64-[2|4|8|15|30|60|120]GB, ARM64-[2|4|8]GB
326+
--commercial-type=DEV1-S Create a server with specific commercial-type DEV1-[S|M|L|XL], GP1-[XS|S|M|L|XL], RENDER-S
327327
-e, --env="" Provide metadata tags passed to initrd (i.e., boot=rescue INITRD_DEBUG=1)
328328
-h, --help=false Print usage
329329
--ip-address=dynamic Assign a reserved public IP, a 'dynamic' one or 'none'
@@ -721,7 +721,7 @@ Options:
721721
-a, --attach=false Attach to serial console
722722
--boot-type=auto Choose between 'local' and 'bootscript' boot
723723
--bootscript="" Assign a bootscript
724-
--commercial-type=DEV1-S Start a server with specific commercial-type C1, C2[S|M|L], X64-[2|4|8|15|30|60|120]GB, ARM64-[2|4|8]GB
724+
--commercial-type=DEV1-S Start a server with specific commercial-type DEV1-[S|M|L|XL], GP1-[XS|S|M|L|XL], RENDER-S
725725
-d, --detach=false Run server in background and print server ID
726726
-e, --env="" Provide metadata tags passed to initrd (i.e., boot=rescue INITRD_DEBUG=1)
727727
-g, --gateway="" Use a SSH gateway
@@ -741,8 +741,8 @@ Options:
741741
Examples:
742742

743743
$ scw run ubuntu-trusty
744-
$ scw run --commercial-type=C2S ubuntu-trusty
745-
$ scw run --show-boot --commercial-type=C2S ubuntu-trusty
744+
$ scw run --commercial-type=DEV1-S ubuntu-trusty
745+
$ scw run --show-boot --commercial-type=DEV1-S ubuntu-trusty
746746
$ scw run --rm ubuntu-trusty
747747
$ scw run -a --rm ubuntu-trusty
748748
$ scw run --gateway=myotherserver ubuntu-trusty

‎pkg/api/api.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ type ScalewayServer struct {
587587
// Organization is the owner of the server
588588
Organization string `json:"organization,omitempty"`
589589

590-
// CommercialType is the commercial type of the server (i.e: C1, C2[SML], START1-S)
590+
// CommercialType is the commercial type of the server (i.e: DEV1-[S|M|L|XL], GP1-[XS|S|M|L|XL], RENDER-S)
591591
CommercialType string `json:"commercial_type,omitempty"`
592592

593593
// Location of the server
@@ -689,7 +689,7 @@ type ScalewayServerDefinition struct {
689689
// Organization is the owner of the server
690690
Organization string `json:"organization"`
691691

692-
// CommercialType is the commercial type of the server (i.e: C1, C2[SML], START1-S)
692+
// CommercialType is the commercial type of the server (i.e: DEV1-[S|M|L|XL], GP1-[XS|S|M|L|XL], RENDER-S)
693693
CommercialType string `json:"commercial_type"`
694694

695695
PublicIP string `json:"public_ip,omitempty"`

‎pkg/cli/cmd_attach.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var cmdAttach = &Command{
1414
Examples: `
1515
$ scw attach my-running-server
1616
$ scw attach $(scw start my-stopped-server)
17-
$ scw attach $(scw start $(scw create ubuntu-vivid))
17+
$ scw attach $(scw start $(scw create ubuntu-bionic))
1818
`,
1919
}
2020

‎pkg/cli/cmd_create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func init() {
3131
cmdCreate.Flag.StringVar(&createEnv, []string{"e", "-env"}, "", "Provide metadata tags passed to initrd (i.e., boot=rescue INITRD_DEBUG=1)")
3232
cmdCreate.Flag.StringVar(&createVolume, []string{"v", "-volume"}, "", "Attach additional volume (i.e., 50G)")
3333
cmdCreate.Flag.StringVar(&createIPAddress, []string{"-ip-address"}, "dynamic", "Assign a reserved public IP, a 'dynamic' one or 'none'")
34-
cmdCreate.Flag.StringVar(&createCommercialType, []string{"-commercial-type"}, "DEV1-S", "Create a server with specific commercial-type C1, C2[S|M|L], X64-[2|4|8|15|30|60|120]GB, ARM64-[2|4|8]GB")
34+
cmdCreate.Flag.StringVar(&createCommercialType, []string{"-commercial-type"}, "DEV1-S", "Create a server with specific commercial-type DEV1-[S|M|L|XL], GP1-[XS|S|M|L|XL], RENDER-S")
3535
cmdCreate.Flag.StringVar(&createBootType, []string{"-boot-type"}, "auto", "Choose between 'local' and 'bootscript' boot")
3636
cmdCreate.Flag.BoolVar(&createHelp, []string{"h", "-help"}, false, "Print usage")
3737
cmdCreate.Flag.BoolVar(&createIPV6, []string{"-ipv6"}, false, "Enable IPV6")

‎pkg/cli/cmd_exec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ var cmdExec = &Command{
1717
$ scw exec --gateway=myotherserver myserver bash
1818
$ scw exec myserver 'tmux a -t joe || tmux new -s joe || bash'
1919
$ SCW_SECURE_EXEC=1 scw exec myserver bash
20-
$ scw exec -w $(scw start $(scw create ubuntu-trusty)) bash
21-
$ scw exec $(scw start -w $(scw create ubuntu-trusty)) bash
20+
$ scw exec -w $(scw start $(scw create ubuntu-bionic)) bash
21+
$ scw exec $(scw start -w $(scw create ubuntu-bionic)) bash
2222
$ scw exec myserver tmux new -d sleep 10
2323
$ scw exec myserver ls -la | grep password
2424
$ cat local-file | scw exec myserver 'cat > remote/path'

‎pkg/cli/cmd_run.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ var cmdRun = &Command{
1717
Description: "Run a command in a new server",
1818
Help: "Run a command in a new server.",
1919
Examples: `
20-
$ scw run ubuntu-trusty
21-
$ scw run --commercial-type=C2S ubuntu-trusty
22-
$ scw run --show-boot --commercial-type=C2S ubuntu-trusty
23-
$ scw run --rm ubuntu-trusty
24-
$ scw run -a --rm ubuntu-trusty
25-
$ scw run --gateway=myotherserver ubuntu-trusty
26-
$ scw run ubuntu-trusty bash
20+
$ scw run ubuntu-bionic
21+
$ scw run --commercial-type=DEV1-S ubuntu-bionic
22+
$ scw run --show-boot --commercial-type=DEV1-S ubuntu-bionic
23+
$ scw run --rm ubuntu-bionic
24+
$ scw run -a --rm ubuntu-bionic
25+
$ scw run --gateway=myotherserver ubuntu-bionic
26+
$ scw run ubuntu-bionic bash
2727
$ scw run --name=mydocker docker docker run moul/nyancat:armhf
2828
$ scw run --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB bash
2929
$ scw run --attach alpine
@@ -45,7 +45,7 @@ func init() {
4545
cmdRun.Flag.BoolVar(&runDetachFlag, []string{"d", "-detach"}, false, "Run server in background and print server ID")
4646
cmdRun.Flag.StringVar(&runGateway, []string{"g", "-gateway"}, "", "Use a SSH gateway")
4747
cmdRun.Flag.StringVar(&runUserdatas, []string{"u", "-userdata"}, "", "Start a server with userdata predefined")
48-
cmdRun.Flag.StringVar(&runCommercialType, []string{"-commercial-type"}, "DEV1-S", "Start a server with specific commercial-type C1, C2[S|M|L], X64-[2|4|8|15|30|60|120]GB, ARM64-[2|4|8]GB")
48+
cmdRun.Flag.StringVar(&runCommercialType, []string{"-commercial-type"}, "DEV1-S", "Start a server with specific commercial-type DEV1-[S|M|L|XL], GP1-[XS|S|M|L|XL], RENDER-S")
4949
cmdRun.Flag.StringVar(&runBootType, []string{"-boot-type"}, "auto", "Choose between 'local' and 'bootscript' boot")
5050
cmdRun.Flag.StringVar(&runSSHUser, []string{"-user"}, "root", "Specify SSH User")
5151
cmdRun.Flag.BoolVar(&runAutoRemove, []string{"-rm"}, false, "Automatically remove the server when it exits")

‎pkg/commands/login.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ func RunLogin(ctx CommandContext, args LoginArgs) error {
314314
}
315315
fmt.Println("")
316316
fmt.Println("You are now authenticated on Scaleway.com", name)
317-
fmt.Println("You can list your existing servers using `scw ps` or create a new one using `scw run ubuntu-xenial`.")
317+
fmt.Println("You can list your existing servers using `scw ps` or create a new one using `scw run ubuntu-bionic`.")
318318
fmt.Println("You can get a list of all available commands using `scw -h` and get more usage examples on github.com/scaleway/scaleway-cli.")
319319
fmt.Println("Happy cloud riding.")
320320
return cfg.Save(ctx.ConfigPath)

‎pkg/commands/run_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package commands
77
func ExampleRun() {
88
ctx := testCommandContext()
99
args := RunArgs{
10-
Image: "ubuntu-trusty",
11-
CommercialType: "X64-2GB",
10+
Image: "ubuntu-bionic",
11+
CommercialType: "DEV1-S",
1212
}
1313
Run(ctx, args)
1414
}
@@ -21,11 +21,11 @@ func ExampleRun_complex() {
2121
Command: []string{"ls", "-la"},
2222
Detach: false,
2323
Gateway: "my-gateway",
24-
Image: "ubuntu-trusty",
24+
Image: "ubuntu-bionic",
2525
Name: "my-test-server",
26-
CommercialType: "X64-2GB",
26+
CommercialType: "DEV1-S",
2727
Tags: []string{"testing", "fake"},
28-
Volumes: []string{"50G", "1G"},
28+
Volumes: []string{"10G", "10G"},
2929
}
3030
Run(ctx, args)
3131
}

0 commit comments

Comments
 (0)