Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Nov 24, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a33215
fix: prevent error if "dockerfile" isn't set
dunglas Nov 24, 2020
5db68e3
test: add test for #1917
dunglas Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/pipe/docker/docker.go
View file
Open in desktop
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
View file
Open in desktop
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