Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: prevent error if "dockerfile" isn't set (#1917)
* fix: prevent error if "dockerfile" isn't set

* test: add test for #1917
  • Loading branch information
dunglas committed Nov 24, 2020
1 parent 5054769 commit a6c4b7e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
6 changes: 3 additions & 3 deletions internal/pipe/docker/docker.go
Expand Up @@ -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)
Expand All @@ -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
}

Expand Down
18 changes: 18 additions & 0 deletions internal/pipe/docker/docker_test.go
Expand Up @@ -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{
Expand Down

1 comment on commit a6c4b7e

@vercel
Copy link

@vercel vercel bot commented on a6c4b7e Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.