go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-03-27 21:39:20 +02:00
Code Issues Releases Activity

fix: prevent error if "dockerfile" isn't set (#1917)

Browse Source 
* fix: prevent error if "dockerfile" isn't set

* test: add test for #1917
This commit is contained in:
Kévin Dunglas 2020-11-24 23:41:40 +01:00 committed by GitHub
parent 50547696ca
commit a6c4b7e862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/pipe/docker/docker.go
View File

@ -40,6 +40,9 @@ func (Pipe) Default(ctx *context.Context) error {
if docker.Goarch == "" {
docker.Goarch = "amd64"
}
if docker.Dockerfile == "" {
docker.Dockerfile = "Dockerfile"
}
for _, f := range docker.Files {
if f == "." || strings.HasPrefix(f, ctx.Config.Dist) {
return fmt.Errorf("invalid docker.files: can't be . or inside dist folder: %s", f)
@ -55,9 +58,6 @@ func (Pipe) Default(ctx *context.Context) error {
ctx.Config.Builds[0].Binary,
}
}
if ctx.Config.Dockers[0].Dockerfile == "" {
ctx.Config.Dockers[0].Dockerfile = "Dockerfile"
}
return nil
}

18
internal/pipe/docker/docker_test.go
View File

@ -725,6 +725,24 @@ func TestDefault(t *testing.T) {
require.Empty(t, docker.Builds)
}
func TestDefaultDockerfile(t *testing.T) {
var ctx = &context.Context{
Config: config.Project{
Builds: []config.Build{
{},
},
Dockers: []config.Docker{
{},
{},
},
},
}
require.NoError(t, Pipe{}.Default(ctx))
require.Len(t, ctx.Config.Dockers, 2)
require.Equal(t, "Dockerfile", ctx.Config.Dockers[0].Dockerfile)
require.Equal(t, "Dockerfile", ctx.Config.Dockers[1].Dockerfile)
}
func TestDefaultBinaries(t *testing.T) {
var ctx = &context.Context{
Config: config.Project{