diff --git a/config/load_test.go b/config/load_test.go index 996b73c0..2508de0f 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -93,7 +93,7 @@ func TestLoad(t *testing.T) { "DRONE_DATABASE_DRIVER": "mysql", "DRONE_DATABASE_DATASOURCE": "user:password@/dbname", "DRONE_DIGITALOCEAN_TOKEN": "2573633eb", - "DRONE_DIGITALOCEAN_IMAGE": "docker-18-04", + "DRONE_DIGITALOCEAN_IMAGE": "docker-20-04", "DRONE_DIGITALOCEAN_REGION": "ncy1", "DRONE_DIGITALOCEAN_SSHKEY": "/path/to/ssh/key", "DRONE_DIGITALOCEAN_SIZE": "s-1vcpu-1gb", @@ -244,7 +244,7 @@ var jsonConfig = []byte(`{ }, "DigitalOcean": { "Token": "2573633eb", - "Image": "docker-18-04", + "Image": "docker-20-04", "Region": "ncy1", "SSHKey": "/path/to/ssh/key", "Size": "s-1vcpu-1gb", diff --git a/drivers/digitalocean/create_test.go b/drivers/digitalocean/create_test.go index 277cb2d5..8cf75f8a 100644 --- a/drivers/digitalocean/create_test.go +++ b/drivers/digitalocean/create_test.go @@ -147,7 +147,7 @@ func testInstance(instance *autoscaler.Instance) func(t *testing.T) { if got, want := instance.ID, "3164494"; got != want { t.Errorf("Want droplet ID %v, got %v", want, got) } - if got, want := instance.Image, "docker-18-04"; got != want { + if got, want := instance.Image, "docker-20-04"; got != want { t.Errorf("Want droplet Image %v, got %v", want, got) } if got, want := instance.Name, "example.com"; got != want { diff --git a/drivers/digitalocean/provider.go b/drivers/digitalocean/provider.go index 35754b4f..bed254ae 100644 --- a/drivers/digitalocean/provider.go +++ b/drivers/digitalocean/provider.go @@ -43,7 +43,7 @@ func New(opts ...Option) autoscaler.Provider { p.size = "s-2vcpu-4gb" } if p.image == "" { - p.image = "docker-18-04" + p.image = "docker-20-04" } if p.userdata == nil { p.userdata = userdataT diff --git a/drivers/digitalocean/provider_test.go b/drivers/digitalocean/provider_test.go index 619cebdc..bf1e6ffe 100644 --- a/drivers/digitalocean/provider_test.go +++ b/drivers/digitalocean/provider_test.go @@ -8,7 +8,7 @@ import "testing" func TestDefaults(t *testing.T) { p := New().(*provider) - if got, want := p.image, "docker-18-04"; got != want { + if got, want := p.image, "docker-20-04"; got != want { t.Errorf("Want image %q, got %q", want, got) } if got, want := p.region, "nyc1"; got != want { diff --git a/server/servers_test.go b/server/servers_test.go index 1a314ae1..9178ac21 100644 --- a/server/servers_test.go +++ b/server/servers_test.go @@ -176,7 +176,7 @@ func TestHandleServerDelete(t *testing.T) { server := &autoscaler.Server{ Name: "i-5203422c", - Image: "docker-18-04", + Image: "docker-20-04", Region: "nyc1", Size: "s-1vcpu-1gb", } @@ -233,7 +233,7 @@ func TestHandleServerDeleteFailure(t *testing.T) { server := &autoscaler.Server{ Name: "i-5203422c", - Image: "docker-18-04", + Image: "docker-20-04", Region: "nyc1", Size: "s-1vcpu-1gb", } @@ -270,7 +270,7 @@ func TestHandleServerDeleteErrorState(t *testing.T) { ID: "", State: autoscaler.StateError, Name: "i-5203422c", - Image: "docker-18-04", + Image: "docker-20-04", Region: "nyc1", Size: "s-1vcpu-1gb", } @@ -299,7 +299,7 @@ func TestHandleServerForceDeleteErrorState(t *testing.T) { ID: "i-5203422c", State: autoscaler.StateError, Name: "i-5203422c", - Image: "docker-18-04", + Image: "docker-20-04", Region: "nyc1", Size: "s-1vcpu-1gb", }