From f891065b9f446022cbd06dfdb4f7e07b0a618d6f Mon Sep 17 00:00:00 2001
From: Sam Alba <samalba@users.noreply.github.com>
Date: Wed, 19 Jan 2022 09:58:38 -0800
Subject: [PATCH] Universe: fix alpine.#Build

Signed-off-by: Sam Alba <samalba@users.noreply.github.com>
---
 pkg/universe.dagger.io/alpine/alpine.cue | 14 ++++++++------
 pkg/universe.dagger.io/yarn/yarn.cue     | 10 +++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkg/universe.dagger.io/alpine/alpine.cue b/pkg/universe.dagger.io/alpine/alpine.cue
index f50fab9b..380a3018 100644
--- a/pkg/universe.dagger.io/alpine/alpine.cue
+++ b/pkg/universe.dagger.io/alpine/alpine.cue
@@ -22,12 +22,14 @@ let defaultVersion = "3.13.5@sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145
 				source: "index.docker.io/alpine:\(version)"
 			},
 			for pkgName, pkg in packages {
-				run: cmd: {
-					name: "apk"
-					args: ["add", "\(pkgName)\(version)"]
-					flags: {
-						"-U":         true
-						"--no-cache": true
+				docker.#Run & {
+					cmd: {
+						name: "apk"
+						args: ["add", "\(pkgName)\(pkg.version)"]
+						flags: {
+							"-U":         true
+							"--no-cache": true
+						}
 					}
 				}
 			},
diff --git a/pkg/universe.dagger.io/yarn/yarn.cue b/pkg/universe.dagger.io/yarn/yarn.cue
index 059b2796..05467d78 100644
--- a/pkg/universe.dagger.io/yarn/yarn.cue
+++ b/pkg/universe.dagger.io/yarn/yarn.cue
@@ -47,9 +47,13 @@ import (
 	// Yarn version
 	// yarnVersion: *"=~1.22" | string
 
-	// FIXME: trouble getting docker.#Build to work (cueflow task dependencies not working)
-	image: alpine.#Build & {
-		packages: "bash": {}
+	image: docker.#Image | *{
+		alpine.#Build & {
+		packages: {
+			"bash": {}
+			"yarn": {}
+		}
+	}
 	}
 
 	// Run yarn in a containerized build environment