From ca6930bd029c4ae981c61cb9c183f30f2726b6c4 Mon Sep 17 00:00:00 2001
From: dubo-dubon-duponey <dubodubonduponey+github@pm.me>
Date: Tue, 11 May 2021 14:36:57 -0700
Subject: [PATCH] Implement user & hosts for Exec

Signed-off-by: dubo-dubon-duponey <dubodubonduponey+github@pm.me>
---
 dagger/pipeline.go      | 28 ++++++++++++++++++++++++++++
 stdlib/dagger/op/op.cue |  4 ++++
 2 files changed, 32 insertions(+)

diff --git a/dagger/pipeline.go b/dagger/pipeline.go
index b1fe2c8a..8c05ac37 100644
--- a/dagger/pipeline.go
+++ b/dagger/pipeline.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
+	"net"
 	"path"
 	"strings"
 
@@ -392,6 +393,33 @@ func (p *Pipeline) Exec(ctx context.Context, op *compiler.Value, st llb.State) (
 		// There's an ongoing proposal that would fix this: https://github.com/moby/buildkit/issues/1213
 		opts = append(opts, llb.IgnoreCache)
 	}
+
+	if hosts := op.Lookup("hosts"); hosts.Exists() {
+		fields, err := hosts.Fields()
+		if err != nil {
+			return st, err
+		}
+		for _, host := range fields {
+			s, err := host.Value.String()
+			if err != nil {
+				return st, err
+			}
+
+			if err != nil {
+				return st, err
+			}
+			opts = append(opts, llb.AddExtraHost(host.Label(), net.ParseIP(s)))
+		}
+	}
+
+	if user := op.Lookup("user"); user.Exists() {
+		u, err := user.String()
+		if err != nil {
+			return st, err
+		}
+		opts = append(opts, llb.User(u))
+	}
+
 	// mounts
 	if mounts := op.Lookup("mount"); mounts.Exists() {
 		mntOpts, err := p.mountAll(ctx, mounts)
diff --git a/stdlib/dagger/op/op.cue b/stdlib/dagger/op/op.cue
index 736be630..43484781 100644
--- a/stdlib/dagger/op/op.cue
+++ b/stdlib/dagger/op/op.cue
@@ -52,6 +52,10 @@ package op
 	//    see https://github.com/dagger/dagger/issues/445
 	// mount: [string]: "tmpfs" | "cache" | {from: _, path: string | *"/"}
 	mount: [string]: _
+	// Map of hostnames to ip
+	hosts?: [string]: string
+	// User to exec with (if left empty, will default to the set user in the image)
+	user?: string
 }
 
 #DockerLogin: {