Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions cmd/compose/compose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
package compose

import (
"errors"
"testing"

"github.com/compose-spec/compose-go/v2/types"
"github.com/moby/moby/client"
"go.uber.org/mock/gomock"
"gotest.tools/v3/assert"

"github.com/docker/compose/v5/pkg/mocks"
)

func TestFilterServices(t *testing.T) {
Expand Down Expand Up @@ -53,3 +58,48 @@ func TestFilterServices(t *testing.T) {
_, err = p.GetService("zot")
assert.NilError(t, err)
}

func TestUpLoadsConfigBeforeDockerConnection(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

wd := t.TempDir()
t.Chdir(wd)
configDir := t.TempDir()
t.Setenv("COMPOSE_FILE", configDir)

cli := mocks.NewMockCli(ctrl)

cmd := upCommand(&ProjectOptions{}, cli, &BackendOptions{})
cmd.SetContext(t.Context())
cmd.SetArgs([]string{"-d"})

err := cmd.Execute()

assert.ErrorContains(t, err, "is a directory")
}

func TestUpChecksDockerConnectionBeforeDefaultConfigDiscovery(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

wd := t.TempDir()
t.Chdir(wd)

socketErr := errors.New("permission denied while trying to connect to the docker API at unix:///var/run/docker.sock")
apiClient := mocks.NewMockAPIClient(ctrl)
apiClient.EXPECT().
Ping(gomock.Any(), client.PingOptions{}).
Return(client.PingResult{}, socketErr)

cli := mocks.NewMockCli(ctrl)
cli.EXPECT().Client().Return(apiClient)

cmd := upCommand(&ProjectOptions{}, cli, &BackendOptions{})
cmd.SetContext(t.Context())
cmd.SetArgs([]string{"-d"})

err := cmd.Execute()

assert.ErrorIs(t, err, socketErr)
}
79 changes: 78 additions & 1 deletion cmd/compose/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@ import (
"errors"
"fmt"
"os"
"path/filepath"
"strings"
"time"

composecli "github.com/compose-spec/compose-go/v2/cli"
"github.com/compose-spec/compose-go/v2/consts"
"github.com/compose-spec/compose-go/v2/types"
"github.com/docker/cli/cli/command"
xprogress "github.com/moby/buildkit/util/progress/progressui"
"github.com/moby/moby/client"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down Expand Up @@ -124,7 +128,10 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backendOptions *Backend
if !cmd.Flags().Changed("remove-orphans") {
create.removeOrphans = utils.StringToBool(os.Getenv(ComposeRemoveOrphans))
}
return validateFlags(&up, &create)
if err := validateFlags(&up, &create); err != nil {
return err
}
return checkDockerConnectionBeforeDefaultConfigDiscovery(ctx, p, dockerCli)
}),
RunE: p.WithServices(dockerCli, func(ctx context.Context, project *types.Project, services []string) error {
create.ignoreOrphans = utils.StringToBool(project.Environment[ComposeIgnoreOrphans])
Expand Down Expand Up @@ -186,6 +193,76 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backendOptions *Backend
return upCmd
}

func checkDockerConnectionBeforeDefaultConfigDiscovery(ctx context.Context, projectOptions *ProjectOptions, dockerCli command.Cli) error {
if len(projectOptions.ConfigPaths) > 0 {
return nil
}
if _, ok := os.LookupEnv(consts.ComposeFilePath); ok {
return nil
}
if len(projectOptions.EnvFiles) > 0 {
return nil
}
if implicitDotEnvDefinesComposeFile(projectOptions.ProjectDir) {
return nil
}
if hasDefaultConfigPath(projectOptions.ProjectDir) {
return nil
}

_, err := dockerCli.Client().Ping(ctx, client.PingOptions{})
return err
}

func implicitDotEnvDefinesComposeFile(projectDir string) bool {
projectDir, ok := implicitProjectDir(projectDir)
if !ok {
return false
}
file, err := os.Open(filepath.Join(projectDir, ".env"))
if err != nil {
return false
}
defer func() { _ = file.Close() }()

vars := map[string]string{}
if err := rawEnv(file, ".env", vars, os.LookupEnv); err != nil {
return true
}
_, ok = vars[consts.ComposeFilePath]
return ok
}

func hasDefaultConfigPath(projectDir string) bool {
projectDir, ok := implicitProjectDir(projectDir)
if !ok {
return false
}
for {
for _, name := range composecli.DefaultFileNames {
if _, err := os.Stat(filepath.Join(projectDir, name)); err == nil {
return true
}
}
parent := filepath.Dir(projectDir)
if parent == projectDir {
return false
}
projectDir = parent
}
}

func implicitProjectDir(projectDir string) (string, bool) {
if projectDir != "" {
return projectDir, true
}
wd, err := os.Getwd()
if err != nil {
return "", false
}
return wd, true
}

//nolint:gocyclo
func validateFlags(up *upOptions, create *createOptions) error {
if up.waitTimeout < 0 {
Expand Down