examples/ssh: Sync version

Author: the-maldridge

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.17
       -
         name: Import GPG key
         id: import_gpg

examples/sshd/providers.tf

@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     linuxkit = {
-      source  = "terraform.resinstack.io/resinstack/linuxkit"
-      version = "~> 1.0"
+      source  = "resinstack/linuxkit"
+      version = "0.0.4"
     }
   }
 }

go.mod

@@ -8,13 +8,11 @@ require (
 	github.com/gofrs/uuid v3.3.0+incompatible // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
-	github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20220101224656-b5bf29c0f64a
+	github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20220110180034-5b7466732a90
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/pkg/errors v0.9.1
 	github.com/xeipuuv/gojsonschema v0.0.0-20180816142147-da425ebb7609 // indirect
 	github.com/zclconf/go-cty v1.4.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )
-
-replace github.com/linuxkit/linuxkit/src/cmd/linuxkit => ../../linuxkit/linuxkit/src/cmd/linuxkit

go.sum

@@ -656,8 +656,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20220101224656-b5bf29c0f64a h1:6R5veivLe9PxvKmDEShjP70hYg1xHfQX/B/p8Xl9ts4=
-github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20220101224656-b5bf29c0f64a/go.mod h1:zsOmfchTlI3Ai0pxUrSaHv6yxZdSUQF6ffSJlwier2k=
+github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20220110180034-5b7466732a90 h1:+ot68CMAIQmUDFufoLoOLKlOtdybZSqMsSPRP3voAIs=
+github.com/linuxkit/linuxkit/src/cmd/linuxkit v0.0.0-20220110180034-5b7466732a90/go.mod h1:zsOmfchTlI3Ai0pxUrSaHv6yxZdSUQF6ffSJlwier2k=
 github.com/linuxkit/virtsock v0.0.0-20180830132707-8e79449dea07/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=

linuxkit/data_source_config.go

@@ -2,7 +2,6 @@ package linuxkit
 
 import (
 	"errors"
-	"runtime"
 
 	"gopkg.in/yaml.v2"
 
@@ -57,12 +56,6 @@ func withConfigSchema(s map[string]*schema.Schema) {
 		ForceNew:    true,
 		Elem:        &schema.Schema{Type: schema.TypeString},
 	}
-	s["architecture"] = &schema.Schema{
-		Type: schema.TypeString,
-		Description: "Architecture to build for",
-		Optional: true,
-		ForceNew: true,
-	}
 }
 
 func fromConfigSchema(d *schema.ResourceData) (*moby.Moby, []byte, error) {
@@ -126,12 +119,6 @@ func fromConfigSchema(d *schema.ResourceData) (*moby.Moby, []byte, error) {
 		}
 	}
 
-	if v, ok := d.GetOk("architecture"); ok {
-		config.Architecture = v.(string)
-	} else {
-		config.Architecture = runtime.GOARCH
-	}
-
 	byts, err := yaml.Marshal(config)
 	if err != nil {
 		return nil, nil, err

linuxkit/resource_build.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"runtime"
 
 	"gopkg.in/yaml.v2"
 
@@ -52,6 +53,12 @@ func buildResource() *schema.Resource {
 				Description: "Type of build, can be tar or docker",
 				Optional:    true,
 			},
+			"architecture": &schema.Schema{
+				Type:        schema.TypeString,
+				Default:     runtime.GOARCH,
+				Description: "Architecture to build for, defaults to host",
+				Optional:    true,
+			},
 		},
 	}
 
@@ -104,7 +111,7 @@ func buildCreate(d *schema.ResourceData, meta interface{}) error {
 
 	cacheDir := defaultLinuxkitCache()
 
-	err = moby.Build(config, outputFile, false, typ, false, cacheDir, false)
+	err = moby.Build(config, outputFile, false, typ, false, cacheDir, false, d.Get("architecture").(string))
 	if err != nil {
 		return err
 	}