Add Docker Compose scanner with multi-container support

internal/appconfig/config.go

@@ -64,8 +64,9 @@ type Config struct {
 	// the one where the image is replaced upon deploy.  If no container is identified,
 	// this will default to the "app" container, and if that is not present, the first
 	// container in the list will be used.
-	MachineConfig string `toml:"machine_config,omitempty" json:"machine_config,omitempty"`
-	Container     string `toml:"container,omitempty" json:"container,omitempty"`
+	MachineConfig   string   `toml:"machine_config,omitempty" json:"machine_config,omitempty"`
+	Container       string   `toml:"container,omitempty" json:"container,omitempty"`
+	BuildContainers []string `toml:"build_containers,omitempty" json:"build_containers,omitempty"`
 
 	MachineChecks []*ServiceMachineCheck `toml:"machine_checks,omitempty" json:"machine_checks,omitempty"`
 

internal/command/deploy/machines_deploymachinesapp.go

@@ -360,6 +360,12 @@ func (md *machineDeployment) deployCreateMachinesForGroups(ctx context.Context,
 			}
 		}
 
+		// Check if this group has multi-container configuration
+		var hasContainers bool
+		if mConfig, err := groupConfig.ToMachineConfig(name, nil); err == nil {
+			hasContainers = len(mConfig.Containers) > 0
+		}
+
 		// Create spare machines that increases availability unless --ha=false was used
 		if !md.increasedAvailability {
 			continue
@@ -368,11 +374,11 @@ func (md *machineDeployment) deployCreateMachinesForGroups(ctx context.Context,
 		// TODO(Ali): This overwrites the main machine's status log with the standby machine's status log.
 
 		// We strive to provide a HA setup according to:
-		// - Create only 1 machine if the group has mounts
+		// - Create only 1 machine if the group has mounts or containers
 		// - Create 2 machines for groups with services
 		// - Create 1 always-on and 1 standby machine for groups without services
 		switch {
-		case len(groupConfig.Mounts) > 0:
+		case len(groupConfig.Mounts) > 0 || hasContainers:
 			continue
 		case len(services) > 0:
 			fmt.Fprintf(md.io.Out, "Creating a second machine to increase service availability\n")
@@ -457,7 +463,7 @@ func (md *machineDeployment) deployMachinesApp(ctx context.Context) error {
 
 	var machineUpdateEntries []*machineUpdateEntry
 	for _, lm := range md.machineSet.GetMachines() {
-		li, err := md.launchInputForUpdate(lm.Machine())
+		li, err := md.launchInputForUpdate(ctx, lm.Machine())
 		if err != nil {
 			return fmt.Errorf("failed to update machine configuration for %s: %w", lm.FormattedMachineId(), err)
 		}
@@ -1039,7 +1045,7 @@ func (md *machineDeployment) spawnMachineInGroup(ctx context.Context, groupName
 		opt(&options)
 	}
 
-	launchInput, err := md.launchInputForLaunch(groupName, options.guest, standbyFor)
+	launchInput, err := md.launchInputForLaunch(ctx, groupName, options.guest, standbyFor)
 	if err != nil {
 		return nil, fmt.Errorf("error creating machine configuration: %w", err)
 	}
@@ -1166,10 +1172,17 @@ func (md *machineDeployment) warnAboutProcessGroupChanges(diff ProcessGroupsDiff
 		for name := range diff.groupsNeedingMachines {
 			var description string
 			groupConfig, err := md.appConfig.Flatten(name)
+
+			// Check if this group has multi-container configuration
+			var hasContainers bool
+			if mConfig, err := groupConfig.ToMachineConfig(name, nil); err == nil {
+				hasContainers = len(mConfig.Containers) > 0
+			}
+
 			switch {
 			case err != nil:
 				continue
-			case !md.increasedAvailability || len(groupConfig.Mounts) > 0:
+			case !md.increasedAvailability || len(groupConfig.Mounts) > 0 || hasContainers:
 				description = fmt.Sprintf("1 \"%s\" machine", name)
 			case len(groupConfig.AllServices()) > 0:
 				description = fmt.Sprintf("2 \"%s\" machines", name)

internal/command/deploy/machines_launchinput.go

@@ -1,13 +1,15 @@
 package deploy
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"strings"
 
 	"github.com/samber/lo"
 	fly "github.com/superfly/fly-go"
 	"github.com/superfly/flyctl/internal/buildinfo"
+	"github.com/superfly/flyctl/internal/config"
 	"github.com/superfly/flyctl/internal/machine"
 	"github.com/superfly/flyctl/terminal"
 )
@@ -24,7 +26,7 @@ func (md *machineDeployment) launchInputForRestart(origMachineRaw *fly.Machine)
 	}
 }
 
-func (md *machineDeployment) launchInputForLaunch(processGroup string, guest *fly.MachineGuest, standbyFor []string) (*fly.LaunchMachineInput, error) {
+func (md *machineDeployment) launchInputForLaunch(ctx context.Context, processGroup string, guest *fly.MachineGuest, standbyFor []string) (*fly.LaunchMachineInput, error) {
 	mConfig, err := md.appConfig.ToMachineConfig(processGroup, nil)
 	if err != nil {
 		return nil, err
@@ -64,14 +66,19 @@ func (md *machineDeployment) launchInputForLaunch(processGroup string, guest *fl
 		return nil, err
 	}
 
+	// Extract CMD from image for containers that need it
+	if err = md.updateContainerCmdFromImage(ctx, mConfig); err != nil {
+		terminal.Debugf("Warning: failed to extract CMD from images: %v", err)
+	}
+
 	return &fly.LaunchMachineInput{
 		Region:     region,
 		Config:     mConfig,
 		SkipLaunch: skipLaunch(nil, mConfig),
 	}, nil
 }
 
-func (md *machineDeployment) launchInputForUpdate(origMachineRaw *fly.Machine) (*fly.LaunchMachineInput, error) {
+func (md *machineDeployment) launchInputForUpdate(ctx context.Context, origMachineRaw *fly.Machine) (*fly.LaunchMachineInput, error) {
 	mID := origMachineRaw.ID
 	machineShouldBeReplaced := dedicatedHostIdMismatch(origMachineRaw, md.appConfig)
 
@@ -96,6 +103,29 @@ func (md *machineDeployment) launchInputForUpdate(origMachineRaw *fly.Machine) (
 		return nil, err
 	}
 
+	// Extract CMD from image for containers that need it
+	if err = md.updateContainerCmdFromImage(ctx, mConfig); err != nil {
+		terminal.Debugf("Warning: failed to extract CMD from images: %v", err)
+	}
+
+	// Ensure container files from machine_config are re-processed
+	// This is necessary because machine_config files may have been updated locally
+	if md.appConfig.MachineConfig != "" && len(mConfig.Containers) > 0 {
+		// Re-parse the machine config to get fresh file content
+		tempConfig := &fly.MachineConfig{}
+		if err := config.ParseConfig(tempConfig, md.appConfig.MachineConfig); err == nil {
+			// Apply container files from the re-parsed config
+			for _, container := range mConfig.Containers {
+				for _, tempContainer := range tempConfig.Containers {
+					if container.Name == tempContainer.Name && len(tempContainer.Files) > 0 {
+						// Update container files with fresh content
+						container.Files = tempContainer.Files
+					}
+				}
+			}
+		}
+	}
+
 	// Mounts needs special treatment:
 	//   * Volumes attached to existings machines can't be swapped by other volumes
 	//   * The only allowed in-place operation is to update its destination mount path
@@ -284,7 +314,20 @@ func (md *machineDeployment) updateContainerImage(mConfig *fly.MachineConfig) er
 		}
 
 		container.Image = mConfig.Image
+
+		// Note: CMD extraction for multi-container configurations happens after this loop
+	}
+
+	return nil
+}
+
+// updateContainerCmdFromImage extracts CMD from images for containers that need it
+func (md *machineDeployment) updateContainerCmdFromImage(ctx context.Context, mConfig *fly.MachineConfig) error {
+	if len(mConfig.Containers) == 0 {
+		return nil
 	}
 
+	// For now, skip CMD extraction due to registry authentication complexity
+	// Let containers use their image defaults when UseImageDefaults is set
 	return nil
 }

internal/command/deploy/machines_launchinput_test.go

@@ -1,6 +1,7 @@
 package deploy
 
 import (
+	"context"
 	"os"
 	"testing"
 
@@ -68,7 +69,7 @@ func testLaunchInputForBasic(t *testing.T) {
 			},
 		},
 	}
-	li, err := md.launchInputForLaunch("", nil, nil)
+	li, err := md.launchInputForLaunch(context.Background(), "", nil, nil)
 	require.NoError(t, err)
 	assert.Equal(t, want, li)
 
@@ -105,7 +106,7 @@ func testLaunchInputForBasic(t *testing.T) {
 	}
 	want.Config.Image = "super/globe"
 	want.Config.Env["NOT_SET_ON_RESTART_ONLY"] = "true"
-	li, err = md.launchInputForUpdate(origMachineRaw)
+	li, err = md.launchInputForUpdate(context.Background(), origMachineRaw)
 	require.NoError(t, err)
 	assert.Equal(t, want, li)
 }
@@ -121,7 +122,7 @@ func testLaunchInputForUpdateHostStatusUnreachable(t *testing.T) {
 	})
 	assert.NoError(t, err)
 
-	li, err := md.launchInputForUpdate(&fly.Machine{
+	li, err := md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID:     "ab1234567890",
 		Region: "ord",
 		Config: &fly.MachineConfig{
@@ -135,7 +136,7 @@ func testLaunchInputForUpdateHostStatusUnreachable(t *testing.T) {
 
 	// Updating an unreachable machine with a volume attached must fail until we can move the volume to another host
 	md.appConfig.Mounts = []appconfig.Mount{{Source: "data", Destination: "/data"}}
-	_, err = md.launchInputForUpdate(&fly.Machine{
+	_, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		IncompleteConfig: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/data", Name: "data"}},
@@ -150,7 +151,7 @@ func testLaunchInputForUpdateHostStatusUnreachable(t *testing.T) {
 			{ID: "vol_10001", Name: "data"},
 		},
 	}
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		IncompleteConfig: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/data", Name: "replace-me-because-i-m-different-fly-toml"}},
@@ -177,13 +178,13 @@ func testLaunchInputForOnMounts(t *testing.T) {
 	}
 
 	// New machine must get a volume attached
-	li, err := md.launchInputForLaunch("", nil, nil)
+	li, err := md.launchInputForLaunch(context.Background(), "", nil, nil)
 	require.NoError(t, err)
 	require.NotEmpty(t, li.Config.Mounts)
 	assert.Equal(t, fly.MachineMount{Volume: "vol_10001", Path: "/data", Name: "data"}, li.Config.Mounts[0])
 
 	// The machine already has a volume that matches fly.toml [mounts] section
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/data", Name: "data"}},
@@ -197,7 +198,7 @@ func testLaunchInputForOnMounts(t *testing.T) {
 	assert.Equal(t, fly.MachineMount{Volume: "vol_attached", Path: "/data", Name: "data"}, li.Config.Mounts[0])
 
 	// Update a machine with volume attached on a different path
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/update-me", Name: "data"}},
@@ -211,7 +212,7 @@ func testLaunchInputForOnMounts(t *testing.T) {
 	assert.Equal(t, fly.MachineMount{Volume: "vol_attached", Path: "/data", Name: "data"}, li.Config.Mounts[0])
 
 	// Updating a machine with an existing unnamed mount must keep the original mount as much as possible
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/keep-me"}},
@@ -225,7 +226,7 @@ func testLaunchInputForOnMounts(t *testing.T) {
 	assert.Equal(t, fly.MachineMount{Volume: "vol_attached", Path: "/keep-me"}, li.Config.Mounts[0])
 
 	// Updating a machine whose volume name doesn't match fly.toml's mount section must replace the machine altogether
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/replace-me", Name: "replace-me"}},
@@ -240,7 +241,7 @@ func testLaunchInputForOnMounts(t *testing.T) {
 
 	// Updating a machine with an attached volume should trigger a replacement if fly.toml doesn't define one.
 	md.appConfig.Mounts = nil
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/replace-me", Name: "replace-me"}},
@@ -275,7 +276,7 @@ func testLaunchInputForOnMountsAndAutoResize(t *testing.T) {
 	}
 
 	// New machine must get a volume attached
-	li, err := md.launchInputForLaunch("", nil, nil)
+	li, err := md.launchInputForLaunch(context.Background(), "", nil, nil)
 	require.NoError(t, err)
 	require.NotEmpty(t, li.Config.Mounts)
 	assert.Equal(t, fly.MachineMount{
@@ -289,7 +290,7 @@ func testLaunchInputForOnMountsAndAutoResize(t *testing.T) {
 
 	// The machine already has a volume that matches fly.toml [mounts] section
 	// confirm new extend configs will be added
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{
@@ -316,7 +317,7 @@ func testLaunchInputForOnMountsAndAutoResize(t *testing.T) {
 	}, li.Config.Mounts[0])
 
 	// Update a machine with volume attached on a different path
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{
@@ -343,7 +344,7 @@ func testLaunchInputForOnMountsAndAutoResize(t *testing.T) {
 	}, li.Config.Mounts[0])
 
 	// Updating a machine with an existing unnamed mount must keep the original mount as much as possible
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{
@@ -368,7 +369,7 @@ func testLaunchInputForOnMountsAndAutoResize(t *testing.T) {
 	}, li.Config.Mounts[0])
 
 	// Updating a machine whose volume name doesn't match fly.toml's mount section must replace the machine altogether
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{Volume: "vol_attached", Path: "/replace-me", Name: "replace-me"}},
@@ -390,7 +391,7 @@ func testLaunchInputForOnMountsAndAutoResize(t *testing.T) {
 
 	// Updating a machine with an attached volume should trigger a replacement if fly.toml doesn't define one.
 	md.appConfig.Mounts = nil
-	li, err = md.launchInputForUpdate(&fly.Machine{
+	li, err = md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID: "ab1234567890",
 		Config: &fly.MachineConfig{
 			Mounts: []fly.MachineMount{{
@@ -438,7 +439,7 @@ func testLaunchInputForUpdateKeepUnmanagedFields(t *testing.T) {
 		},
 		HostStatus: fly.HostStatusOk,
 	}
-	li, err := md.launchInputForUpdate(origMachineRaw)
+	li, err := md.launchInputForUpdate(context.Background(), origMachineRaw)
 	require.NoError(t, err)
 	assert.Equal(t, "ab1234567890", li.ID)
 	assert.Equal(t, "ord", li.Region)
@@ -470,7 +471,7 @@ func testLaunchInputForUpdateClearStandbysWithServices(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	li, err := md.launchInputForUpdate(&fly.Machine{
+	li, err := md.launchInputForUpdate(context.Background(), &fly.Machine{
 		ID:     "ab1234567890",
 		Region: "scl",
 		Config: &fly.MachineConfig{
@@ -522,7 +523,7 @@ func testLaunchInputForLaunchFiles(t *testing.T) {
 			},
 		},
 	}
-	li, err := md.launchInputForLaunch("", nil, nil)
+	li, err := md.launchInputForLaunch(context.Background(), "", nil, nil)
 	require.NoError(t, err)
 	assert.Equal(t, want, li)
 }
@@ -544,7 +545,7 @@ func testLaunchInputForUpdateFiles(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	li, err := md.launchInputForUpdate(&fly.Machine{
+	li, err := md.launchInputForUpdate(context.Background(), &fly.Machine{
 		HostStatus: fly.HostStatusOk,
 		Config: &fly.MachineConfig{
 			Files: []*fly.File{