Merge pull request #1003 from samalba/docker-run-local

Docker run local

docs/reference/docker/README.md

@@ -76,20 +76,12 @@ Push a docker image to a remote registry
 
 ### docker.#Run Inputs
 
-| Name                  | Type                | Description                           |
-| -------------         |:-------------:      |:-------------:                        |
-|*ssh.host*             | `string`            |ssh host                               |
-|*ssh.user*             | `string`            |ssh user                               |
-|*ssh.port*             | `*22 \| int`        |ssh port                               |
-|*ssh.key*              | `dagger.#Secret`    |private key                            |
-|*ref*                  | `string`            |Image reference (e.g: nginx:alpine)    |
-|*run.ssh.host*         | `string`            |ssh host                               |
-|*run.ssh.user*         | `string`            |ssh user                               |
-|*run.ssh.port*         | `*22 \| int`        |ssh port                               |
-|*run.ssh.key*          | `dagger.#Secret`    |private key                            |
-|*run.command*          | `"""\n              # Run detach container\n                OPTS=""\n    \n    if [ ! -z "$CONTAINER_NAME" ]; then\n    \tOPTS="$OPTS --name $CONTAINER_NAME"\n    fi\n    \n    docker container run -d $OPTS "$IMAGE_REF"\n    """`    |Command to execute    |
-|*run.env.IMAGE_REF*    | `string`            |-                                      |
-|*run.registries*       | `[]`                |Image registries                       |
+| Name                  | Type              | Description                           |
+| -------------         |:-------------:    |:-------------:                        |
+|*ref*                  | `string`          |Image reference (e.g: nginx:alpine)    |
+|*run.command*          | `"""\n            # Run detach container\n                OPTS=""\n    \n    if [ ! -z "$CONTAINER_NAME" ]; then\n    \tOPTS="$OPTS --name $CONTAINER_NAME"\n    fi\n    \n    docker container run -d $OPTS "$IMAGE_REF"\n    """`    |Command to execute    |
+|*run.env.IMAGE_REF*    | `string`          |-                                      |
+|*run.registries*       | `[]`              |Image registries                       |
 
 ### docker.#Run Outputs
 

stdlib/.dagger/env/docker-run-local/values.yaml

@@ -1,6 +1,10 @@
 plan:
     package: ./docker/tests/run-local
 name: docker-run-local
+inputs:
+    dockersocket:
+        socket:
+            unix: /var/run/docker.sock
 sops:
     kms: []
     gcp_kms: []
@@ -16,8 +20,8 @@ sops:
             cnh2eHU5TzFjVkNvTzUyczFBL0pwTDQK60+wrLmTaD3Ws5ZAXdqBkMjaVP7Iz69k
             UrkqkMbaUlvvSKK7dB5MuTGEEN6A1viAGal9ZjDHlSobkNPuE24QEA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2021-07-08T09:54:17Z"
-    mac: ENC[AES256_GCM,data:Fwvi/c8oNOtB8yUl9R0teUibQQLfTyPjhua2DiNhcAZYT1IJeUXnLl+llAGl8hOl5pR1ZLIgbpW46HW6ZBn3bZND0K5/uZL3CNM5+MLlrHzIxy1xFbXXDLYHH0rbRfGmQtSu2b/JKwTiTfbiPSd6VASFtIvoeTU79hQXE2DVmWk=,iv:iFVZvw4KMLOo/u1IrHMF2xZlER2Oqn2RY6pM78o+FyI=,tag:nXJnewaOGz/URq8o8+uYFg==,type:str]
+    lastmodified: "2021-09-21T23:13:41Z"
+    mac: ENC[AES256_GCM,data:jF/Uu0y+uXym4UeXfRmzuZvEkqbk12vzByoiMOk2X/lQ+26x5LzWWwso7/2KjAnDonrKaPLChpaBJE89SIyuLKcU43/ttQ3xZK8TBfj7RWU5hT0Bj1kW2w258LLqcvYSrmHsvzh7aigG561LowJYysoHt4Bt6m66mwZq7wjelqA=,iv:toaSdz6F1oNf5ELSP3/aHLEAzyEAXKLZfxJBoR/aBOY=,tag:2xnNbmSsGTsMD0YT1+valA==,type:str]
     pgp: []
     encrypted_suffix: secret
     version: 3.7.1

stdlib/docker/command.cue

@@ -57,6 +57,9 @@ import (
 		[string]: true @dagger(input)
 	}
 
+	// Mount docker socket
+	socket?: dagger.#Stream @dagger(input)
+
 	// Additional packages to install
 	package: {
 		[string]: true | false | string @dagger(input)
@@ -213,6 +216,9 @@ import (
 						"/keyPassphrase": secret: ssh.keyPassphrase
 					}
 				}
+				if socket != _|_ {
+					"/var/run/docker.sock": stream: socket
+				}
 				for dest, o in mount {
 					"\(dest)": o
 				}

stdlib/docker/compose/compose.cue

@@ -28,6 +28,9 @@ import (
 		keyPassphrase?: dagger.#Secret @dagger(input)
 	}
 
+	// Mount local docker socket
+	socket?: dagger.#Stream & dagger.#Input
+
 	// Accept either a contaxt, a docker-compose or both together
 	source?:      dagger.#Artifact @dagger(input)
 	composeFile?: string           @dagger(input)
@@ -65,7 +68,13 @@ import (
 		"""#
 
 	run: docker.#Command & {
-		"ssh":   ssh
+		if ssh != _|_ {
+			"ssh": ssh
+		}
+		if socket != _|_ {
+			"socket": socket
+		}
+
 		command: #code
 		package: "docker-compose": true
 		"registries": registries

stdlib/docker/docker.cue

@@ -102,7 +102,7 @@ import (
 
 #Run: {
 	// Connect to a remote SSH server
-	ssh: {
+	ssh?: {
 		// ssh host
 		host: dagger.#Input & {string}
 
@@ -122,6 +122,9 @@ import (
 		keyPassphrase?: dagger.#Input & {dagger.#Secret}
 	}
 
+	// Mount local docker socket
+	socket?: dagger.#Stream & dagger.#Input
+
 	// Image reference (e.g: nginx:alpine)
 	ref: dagger.#Input & {string}
 
@@ -147,7 +150,13 @@ import (
 		"""#
 
 	run: #Command & {
-		"ssh":   ssh
+		if ssh != _|_ {
+			"ssh": ssh
+		}
+		if socket != _|_ {
+			"socket": socket
+		}
+
 		command: #command
 		env: {
 			IMAGE_REF: ref

stdlib/docker/tests/run-local/local.cue

@@ -1,14 +1,18 @@
 package docker
 
 import (
+	"alpha.dagger.io/dagger"
 	"alpha.dagger.io/random"
 )
 
+dockersocket: dagger.#Stream & dagger.#Input
+
 suffix: random.#String & {
 	seed: ""
 }
 
 run: #Run & {
-	name: "daggerci-test-local-\(suffix.out)"
-	ref:  "hello-world"
+	name:   "daggerci-test-local-\(suffix.out)"
+	ref:    "hello-world"
+	socket: dockersocket
 }

stdlib/universe.bats

@@ -76,8 +76,7 @@ setup() {
 }
 
 @test "docker run: local" {
-  skip "Not implemented yet + missing inputs leading to failure"
-  # dagger -e docker-run-local up
+  dagger -e docker-run-local up
 }
 
 @test "docker build" {
@@ -257,4 +256,4 @@ setup() {
 @test "azure-stapp" {
     skip "Azure CI infra not implemented yet - manually tested and working"
     #dagger -e azure-stapp up
-}
+}