diff --git a/internal/pipe/docker/docker.go b/internal/pipe/docker/docker.go index 7f868af3bfb..108bc8ba3a8 100644 --- a/internal/pipe/docker/docker.go +++ b/internal/pipe/docker/docker.go @@ -47,6 +47,9 @@ func (Pipe) Default(ctx *context.Context) error { if docker.Goarch == "" { docker.Goarch = "amd64" } + if docker.Goarm == "" { + docker.Goarm = "6" + } if docker.Goamd64 == "" { docker.Goamd64 = "v1" } diff --git a/internal/pipe/docker/docker_test.go b/internal/pipe/docker/docker_test.go index 56115f5d6a6..712f388fb3c 100644 --- a/internal/pipe/docker/docker_test.go +++ b/internal/pipe/docker/docker_test.go @@ -1182,6 +1182,7 @@ func TestDefault(t *testing.T) { docker := ctx.Config.Dockers[0] require.Equal(t, "linux", docker.Goos) require.Equal(t, "amd64", docker.Goarch) + require.Equal(t, "6", docker.Goarm) require.Equal(t, []string{"aa"}, docker.IDs) require.Equal(t, useDocker, docker.Use) docker = ctx.Config.Dockers[1] diff --git a/www/docs/customization/docker.md b/www/docs/customization/docker.md index 35e19975bc4..038c8fcf426 100644 --- a/www/docs/customization/docker.md +++ b/www/docs/customization/docker.md @@ -50,18 +50,23 @@ dockers: id: myimg # GOOS of the built binaries/packages that should be used. + # Default: `linux`. goos: linux # GOARCH of the built binaries/packages that should be used. + # Default: `amd64`. goarch: amd64 # GOARM of the built binaries/packages that should be used. + # Default: `6`. goarm: '' # GOAMD64 of the built binaries/packages that should be used. + # Default: `v1`. goamd64: 'v2' # IDs to filter the binaries/packages. + # Default: `empty`. ids: - mybuild - mynfpm