[docker] One more attempt to make docker-compose happen

modules.json

@@ -811,6 +811,10 @@
     "commit": "1e033d9d59a9bf041a2c24e96eb281d1decdc6b4",
     "path": "/nix/store/zw2cczaql8awhcp0c69si1ib9vidxbjb-replit-module-docker"
   },
+  "docker:v8-20231129-29c8905": {
+    "commit": "29c8905d4ee3c9183c6c36b91fcf6d8041f19da6",
+    "path": "/nix/store/26g4nkrndbf2bf50fp17cp8rl5xdz1gi-replit-module-docker"
+  },
   "dart-3.1:v1-20231128-1e033d9": {
     "commit": "1e033d9d59a9bf041a2c24e96eb281d1decdc6b4",
     "path": "/nix/store/ra46cfdhzrp1gn6rh4l5nnycn3vjv18l-replit-module-dart-3.1"

pkgs/modules/docker/replit-moby.patch

@@ -1,8 +1,19 @@
 diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go
-index 4a1d93c25f..dbaa48f3f6 100644
+index 4a1d93c25f..25b0594764 100644
 --- a/builder/builder-next/executor_unix.go
 +++ b/builder/builder-next/executor_unix.go
-@@ -53,8 +53,9 @@ func newExecutor(root, cgroupParent string, net *libnetwork.Controller, dnsConfi
+@@ -24,7 +24,9 @@ import (
+ 	"github.com/sirupsen/logrus"
+ )
+
+-const networkName = "bridge"
++// Replit mod: We don't have a bridge, so forcing users to specify `--network=host`
++// every build command gets old real fast.
++const networkName = "host"
+
+ func newExecutor(root, cgroupParent string, net *libnetwork.Controller, dnsConfig *oci.DNSConfig, rootless bool, idmap idtools.IdentityMapping, apparmorProfile string) (executor.Executor, error) {
+ 	netRoot := filepath.Join(root, "net")
+@@ -53,8 +55,9 @@ func newExecutor(root, cgroupParent string, net *libnetwork.Controller, dnsConfi
  	}
 
  	return runcexecutor.New(runcexecutor.Opt{

pkgs/modules/docker/replit-runc.patch

@@ -126,10 +126,10 @@ index 6d32704a..b00e4533 100644
  	return nil
  }
 diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
-index c941239b..e58468e4 100644
+index c941239b..c329c89f 100644
 --- a/libcontainer/container_linux.go
 +++ b/libcontainer/container_linux.go
-@@ -500,6 +500,21 @@ func (c *Container) commandTemplate(p *Process, childInitPipe *os.File, childLog
+@@ -500,6 +500,14 @@ func (c *Container) commandTemplate(p *Process, childInitPipe *os.File, childLog
  	if p.LogLevel != "" {
  		cmd.Env = append(cmd.Env, "_LIBCONTAINER_LOGLEVEL="+p.LogLevel)
  	}
@@ -141,13 +141,6 @@ index c941239b..e58468e4 100644
 +	if err == nil {
 +		cmd.Env = append(cmd.Env, "_REPLIT_CONFIG_JSON="+path.Join(wd, "config.json"))
 +	}
-+	// Replit mod: replit-shim-runc starts one reaper socket per instance.
-+	runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
-+	if runtimeDir == "" {
-+			runtimeDir = "/run"
-+	}
-+	externalReapsSocketPath := path.Join(runtimeDir, fmt.Sprintf("containerd/s/%s-reaper.sock", c.id))
-+	cmd.Env = append(cmd.Env, "_REPLIT_REAPER_SOCKET="+externalReapsSocketPath)
 
  	// NOTE: when running a container with no PID namespace and the parent process spawning the container is
  	// PID1 the pdeathsig is being delivered to the container's init process by the kernel for some reason
@@ -186,10 +179,22 @@ index 4cb4a88b..275e0d32 100644
  }
 
 diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
-index 8785d657..328b27f8 100644
+index 8785d657..749df199 100644
 --- a/libcontainer/process_linux.go
 +++ b/libcontainer/process_linux.go
-@@ -162,62 +162,8 @@ func (p *setnsProcess) start() (retErr error) {
+@@ -81,6 +81,11 @@ func (p *setnsProcess) signal(sig os.Signal) error {
+
+ func (p *setnsProcess) start() (retErr error) {
+ 	defer p.messageSockPair.parent.Close()
++	// Replit mod: Set the console socket if we overrode it in this process.
++	socketPath := os.Getenv("_REPLIT_REAPER_SOCKET")
++	if socketPath != "" {
++		p.cmd.Env = append(p.cmd.Env, "_REPLIT_REAPER_SOCKET="+socketPath)
++	}
+ 	// get the "before" value of oom kill count
+ 	oom, _ := p.manager.OOMKillCount()
+ 	err := p.cmd.Start()
+@@ -162,62 +167,8 @@ func (p *setnsProcess) start() (retErr error) {
  		return fmt.Errorf("error writing config to pipe: %w", err)
  	}
 
@@ -254,7 +259,19 @@ index 8785d657..328b27f8 100644
 
  	if err := unix.Shutdown(int(p.messageSockPair.parent.Fd()), unix.SHUT_WR); err != nil {
  		return &os.PathError{Op: "shutdown", Path: "(init pipe)", Err: err}
-@@ -514,6 +460,38 @@ func (p *initProcess) start() (retErr error) {
+@@ -363,6 +314,11 @@ func (p *initProcess) waitForChildExit(childPid int) error {
+
+ func (p *initProcess) start() (retErr error) {
+ 	defer p.messageSockPair.parent.Close() //nolint: errcheck
++	// Replit mod: Set the console socket if we overrode it in this process.
++	socketPath := os.Getenv("_REPLIT_REAPER_SOCKET")
++	if socketPath != "" {
++		p.cmd.Env = append(p.cmd.Env, "_REPLIT_REAPER_SOCKET="+socketPath)
++	}
+ 	err := p.cmd.Start()
+ 	p.process.ops = p
+ 	// close the write-side of the pipes (controlled by child)
+@@ -514,6 +470,38 @@ func (p *initProcess) start() (retErr error) {
  			if err := setupRlimits(p.config.Rlimits, p.pid()); err != nil {
  				return fmt.Errorf("error setting rlimits for ready process: %w", err)
  			}
@@ -294,10 +311,10 @@ index 8785d657..328b27f8 100644
  			// generate a timestamp indicating when the container was started
  			p.container.created = time.Now().UTC()
 diff --git a/signals.go b/signals.go
-index e0bc7c61..19401ac2 100644
+index e0bc7c61..68a3bde9 100644
 --- a/signals.go
 +++ b/signals.go
-@@ -1,8 +1,12 @@
+@@ -1,8 +1,13 @@
  package main
 
  import (
@@ -307,10 +324,11 @@ index e0bc7c61..19401ac2 100644
  	"os"
  	"os/signal"
 +	"path"
++	"time"
 
  	"github.com/opencontainers/runc/libcontainer"
  	"github.com/opencontainers/runc/libcontainer/system"
-@@ -18,8 +22,31 @@ const signalBufferSize = 2048
+@@ -18,8 +23,35 @@ const signalBufferSize = 2048
  // while still forwarding all other signals to the process.
  // If notifySocket is present, use it to read systemd notifications from the container and
  // forward them to notifySocketHost.
@@ -328,38 +346,42 @@ index e0bc7c61..19401ac2 100644
 +		// intention by setting the subreaper is that this process
 +		// will get the signal that the process has died. When that
 +		// happens, we'll completely overwrite the reaper socket.
-+		reaperPath := path.Join(runtimeDir, fmt.Sprintf("containerd/s/%s-reaper.sock", id))
++		reaperPath := path.Join(runtimeDir, fmt.Sprintf("containerd/s/%s-reaper-%016x.sock", id[:16], time.Now().UnixNano()))
 +		os.MkdirAll(path.Dir(reaperPath), 0o700)
 +		os.Remove(reaperPath)
 +		var err error
-+		reaperSocket, err = net.ListenUnix("unix", &net.UnixAddr{
-+			Name: reaperPath,
-+			Net:  "unix",
-+		})
++		reaperSocket, err = net.ListenUnix("unix", &net.UnixAddr{Name: reaperPath})
 +		if err != nil {
 +			logrus.WithError(err).Warn("failed to listen on subreaper socket")
++		} else {
++			previousReaperPath := os.Getenv("_REPLIT_REAPER_SOCKET")
++			if previousReaperPath != "" {
++				os.Setenv("_REPLIT_REAPER_SOCKET", previousReaperPath+":"+reaperPath)
++			} else {
++				os.Setenv("_REPLIT_REAPER_SOCKET", reaperPath)
++			}
 +		}
 +
  		// set us as the subreaper before registering the signal handler for the container
  		if err := system.SetSubreaper(1); err != nil {
  			logrus.Warn(err)
-@@ -33,6 +60,7 @@ func newSignalHandler(enableSubreaper bool, notifySocket *notifySocket) *signalH
+@@ -33,6 +65,7 @@ func newSignalHandler(enableSubreaper bool, notifySocket *notifySocket) *signalH
  	return &signalHandler{
  		signals:      s,
  		notifySocket: notifySocket,
 +		reaperSocket: reaperSocket,
  	}
  }
 
-@@ -46,6 +74,7 @@ type exit struct {
+@@ -46,6 +79,7 @@ type exit struct {
  type signalHandler struct {
  	signals      chan os.Signal
  	notifySocket *notifySocket
 +	reaperSocket *net.UnixListener
  }
 
  // forward handles the main signal event loop forwarding, resizing, or reaping depending
-@@ -71,43 +100,86 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
+@@ -71,43 +105,86 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
  		go func() { _ = h.notifySocket.run(0) }()
  	}
 

pkgs/modules/docker/replit-shim-runc.patch

@@ -34,7 +34,7 @@ index 43dfdf941..9105879c1 100644
 
  		s.send(&eventstypes.TaskStart{
 diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go
-index cf006d805..60316fa8d 100644
+index cf006d805..29860d086 100644
 --- a/runtime/v2/shim/shim.go
 +++ b/runtime/v2/shim/shim.go
 @@ -37,6 +37,7 @@ import (
@@ -45,7 +45,17 @@ index cf006d805..60316fa8d 100644
  	"github.com/containerd/containerd/version"
  	"github.com/containerd/ttrpc"
  	"github.com/sirupsen/logrus"
-@@ -477,6 +478,8 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
+@@ -284,6 +285,9 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
+ 	}
+
+ 	if !config.NoSubreaper {
++		// Replit mod: Containers are not our direct descendants, so
++		// we need to have an external listener for child death events.
++		reaper.ListenExternalReaps(id)
+ 		if err := subreaper(); err != nil {
+ 			return err
+ 		}
+@@ -477,6 +481,8 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
  	if address, err := ReadAddress("address"); err == nil {
  		_ = RemoveSocket(address)
  	}
@@ -54,18 +64,8 @@ index cf006d805..60316fa8d 100644
 
  	select {
  	case <-publisher.Done():
-@@ -518,6 +521,9 @@ func serve(ctx context.Context, server *ttrpc.Server, signals chan os.Signal, sh
- 		}
- 	}()
-
-+	// Replit mod: Containers are not our direct descendants, so
-+	// we need to have an external listener for child death events.
-+	reaper.ListenExternalReaps(id)
- 	go handleExitSignals(ctx, logger, shutdown)
- 	return reap(ctx, logger, signals)
- }
 diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go
-index 8172f224e..58663681e 100644
+index 8172f224e..538c29da1 100644
 --- a/sys/reaper/reaper_unix.go
 +++ b/sys/reaper/reaper_unix.go
 @@ -21,10 +21,16 @@ package reaper
@@ -85,7 +85,7 @@ index 8172f224e..58663681e 100644
  	runc "github.com/containerd/go-runc"
  	exec "golang.org/x/sys/execabs"
  	"golang.org/x/sys/unix"
-@@ -58,6 +64,85 @@ func (s *subscriber) do(fn func()) {
+@@ -58,6 +64,89 @@ func (s *subscriber) do(fn func()) {
  	s.Unlock()
  }
 
@@ -108,8 +108,12 @@ index 8172f224e..58663681e 100644
 +		}
 +
 +		// Register one listener specific to this this shim.
-+		externalReapsSocketPath = path.Join(runtimeDir, fmt.Sprintf("containerd/s/%s-reaper.sock", id))
++		externalReapsSocketPath = path.Join(
++			runtimeDir,
++			fmt.Sprintf("containerd/s/%s-reaper-%016x.sock", id[:16], time.Now().UnixNano()),
++		)
 +		go listenExternalReaps(externalReapsSocketPath)
++		os.Setenv("_REPLIT_REAPER_SOCKET", externalReapsSocketPath)
 +
 +		// TODO: Once roci has been upgraded fully, we can remove this.
 +		sharedSocketPath := path.Join(runtimeDir, "containerd/containerd-reaper.sock")