kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1673 from dagger/extract-yarn-install-into-a-separate-step

Browse Source 
Extract yarn install into a separate step
This commit is contained in:
Gerhard Lazu 2022-03-04 18:48:06 +00:00 committed by GitHub
commit 5267d72b1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/universe.dagger.io/yarn/test/test.cue
View File

@ -66,7 +66,7 @@ dagger.#Plan & {
build: yarn.#Build & { build: yarn.#Build & {
source: common.data source: common.data
container: input: buildImage.output container: #input: buildImage.output
} }
} }
} }

158
pkg/universe.dagger.io/yarn/yarn.cue
View File

@ -16,28 +16,26 @@ import (
script: *"build" | string script: *"build" | string
} }
// Build a Yarn package // Run a Yarn command
#Run: { #Run: {
// Custom name for the build. // Custom name for this command.
// When building different apps in the same plan, assign // Assign an app-specific name if there are multiple apps in the same plan.
// different names for optimal caching.
name: string | *"" name: string | *""
// Application source code // App source code
source: dagger.#FS source: dagger.#FS
// working directory to use // Working directory to use
cwd: *"." | string cwd: *"." | string
// Write the contents of `environment` to this file, // Write the contents of `environment` to this file, in the "envfile" format
// in the "envfile" format
writeEnvFile: string | *"" writeEnvFile: string | *""
// Read build output from this directory // Optional: Read build output from this directory
// (path must be relative to working directory) // Must be relative to working directory, cwd
buildDir?: string buildDir?: string
// Run this yarn script // Yarn script to run for this command.
script: string script: string
// Fix for shadowing issues // Fix for shadowing issues
@ -50,71 +48,97 @@ import (
// FIXME: not implemented. Are they needed? // FIXME: not implemented. Are they needed?
secrets: [string]: dagger.#Secret secrets: [string]: dagger.#Secret
// FIXME: Yarn's version depends on Alpine's version container: #input: docker.#Image | *{
// Yarn version // FIXME: Yarn's version depends on Alpine's version
// yarnVersion: *"=~1.22" | string // Yarn version
// yarnVersion: *"=~1.22" | string
// FIXME: custom base image not supported // FIXME: custom base image not supported
_buildImage: alpine.#Build & { alpine.#Build & {
packages: { packages: {
bash: {} bash: {}
yarn: {} yarn: {}
}
} }
} }
// Run yarn in a docker container _run: docker.#Build & {
container: bash.#Run & { steps: [
input: *_buildImage.output | docker.#Image container.#input,
// FIXME: move shell script to its own file docker.#Copy & {
script: contents: #"""
# Create $ENVFILE_NAME file if set
[ -n "$ENVFILE_NAME" ] && echo "$ENVFILE" > "$ENVFILE_NAME"
yarn --cwd "$YARN_CWD" install --production false
opts=( $(echo $YARN_ARGS) )
yarn --cwd "$YARN_CWD" run "$YARN_BUILD_SCRIPT" ${opts[@]}
if [ ! -z "${YARN_BUILD_DIRECTORY:-}" ]; then
mv "$YARN_BUILD_DIRECTORY" /build
else
mkdir /build
fi
"""#
mounts: {
"yarn cache": {
dest: "/cache/yarn"
contents: dagger.#CacheDir & {
// FIXME: are there character limitations in cache ID?
id: "universe.dagger.io/yarn.#Build \(name)"
}
}
"package source": {
dest: "/src" dest: "/src"
contents: source contents: source
} },
}
export: directories: "/build": _ bash.#Run & {
// FIXME: move shell script to its own file
script: contents: #"""
yarn --cwd "$YARN_CWD" install --production false
"""#
env: { mounts: "yarn cache": {
YARN_BUILD_SCRIPT: yarnScript dest: "/cache/yarn"
YARN_ARGS: strings.Join(args, "\n") contents: dagger.#CacheDir & {
YARN_CACHE_FOLDER: "/cache/yarn" // FIXME: are there character limitations in cache ID?
YARN_CWD: cwd id: "universe.dagger.io/yarn.#Run \(name)"
if buildDir != _|_ { }
YARN_BUILD_DIRECTORY: buildDir }
}
if writeEnvFile != "" {
ENVFILE_NAME: writeEnvFile
ENVFILE: strings.Join([ for k, v in env {"\(k)=\(v)"}], "\n")
}
}
workdir: "/src" env: {
YARN_CACHE_FOLDER: "/cache/yarn"
YARN_CWD: cwd
}
workdir: "/src"
},
bash.#Run & {
// FIXME: move shell script to its own file
script: contents: #"""
# Create $ENVFILE_NAME file if set
[ -n "$ENVFILE_NAME" ] && echo "$ENVFILE" > "$ENVFILE_NAME"
opts=( $(echo $YARN_ARGS) )
yarn --cwd "$YARN_CWD" run "$YARN_BUILD_SCRIPT" ${opts[@]}
if [ ! -z "${YARN_BUILD_DIRECTORY:-}" ]; then
mv "$YARN_BUILD_DIRECTORY" /build
else
mkdir /build
fi
"""#
mounts: "yarn cache": {
dest: "/cache/yarn"
contents: dagger.#CacheDir & {
// FIXME: are there character limitations in cache ID?
id: "universe.dagger.io/yarn.#Run \(name)"
}
}
env: {
YARN_BUILD_SCRIPT: yarnScript
YARN_ARGS: strings.Join(args, "\n")
YARN_CACHE_FOLDER: "/cache/yarn"
YARN_CWD: cwd
if buildDir != _|_ {
YARN_BUILD_DIRECTORY: buildDir
}
if writeEnvFile != "" {
ENVFILE_NAME: writeEnvFile
ENVFILE: strings.Join([ for k, v in env {"\(k)=\(v)"}], "\n")
}
}
workdir: "/src"
},
]
} }
// The final contents of the package after build // The final contents of the package after run
output: container.export.directories."/build" _output: dagger.#Subdir & {
input: _run.output.rootfs
path: "/build"
}
output: _output.output
} }