mirror of
https://github.com/goreleaser/goreleaser.git
synced 2025-03-17 20:47:50 +02:00
fix: prevent error if "dockerfile" isn't set (#1917)
* fix: prevent error if "dockerfile" isn't set * test: add test for #1917
This commit is contained in:
parent
50547696ca
commit
a6c4b7e862
@ -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
|
||||
}
|
||||
|
||||
|
@ -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{
|
||||
|
Loading…
x
Reference in New Issue
Block a user