Move core actions to a subpackage

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
This commit is contained in:
Helder Correia
2022-03-26 14:09:21 -01:00
parent 9f042800da
commit b3bdd347e7
121 changed files with 469 additions and 340 deletions

View File

@@ -56,11 +56,11 @@ dagger.#Plan & {
}
actions: {
runtimeImage: dagger.#Pull & {
runtimeImage: core.#Pull & {
source: runtime_image_ref
}
depsCache: dagger.#CacheDir & {
depsCache: core.#CacheDir & {
id: "depsCache"
}
@@ -69,7 +69,7 @@ dagger.#Plan & {
contents: depsCache
}
buildCacheTest: dagger.#CacheDir & {
buildCacheTest: core.#CacheDir & {
id: "buildCacheTest"
}
@@ -78,7 +78,7 @@ dagger.#Plan & {
contents: buildCacheTest
}
buildCacheProd: dagger.#CacheDir & {
buildCacheProd: core.#CacheDir & {
id: "buildCacheProd"
}
@@ -87,7 +87,7 @@ dagger.#Plan & {
contents: buildCacheProd
}
nodeModulesCache: dagger.#CacheDir & {
nodeModulesCache: core.#CacheDir & {
id: "nodeModulesCache"
}
@@ -96,20 +96,20 @@ dagger.#Plan & {
contents: nodeModulesCache
}
appImage: dagger.#Copy & {
appImage: core.#Copy & {
input: runtimeImage.output
contents: inputs.directories.app.contents
dest: "/app"
}
deps: dagger.#Exec & {
deps: core.#Exec & {
input: appImage.output
mounts: depsCacheMount
workdir: "/app"
args: ["bash", "-c", " mix deps.get"]
}
assetsCompile: dagger.#Exec & {
assetsCompile: core.#Exec & {
input: depsCompileProd.output
mounts: depsCacheMount & nodeModulesCacheMount
workdir: "/app/assets"
@@ -117,7 +117,7 @@ dagger.#Plan & {
args: ["bash", "-c", "yarn install --frozen-lockfile && yarn run compile"]
}
#depsCompile: dagger.#Exec & {
#depsCompile: core.#Exec & {
input: deps.output
mounts: depsCacheMount
workdir: "/app"
@@ -134,7 +134,7 @@ dagger.#Plan & {
mounts: buildCacheProdMount
}
assetsDigest: dagger.#Exec & {
assetsDigest: core.#Exec & {
input: assetsCompile.output
mounts: depsCacheMount & buildCacheProdMount & nodeModulesCacheMount
env: MIX_ENV: "prod"
@@ -142,20 +142,20 @@ dagger.#Plan & {
args: ["bash", "-c", "mix phx.digest"]
}
imageProdCacheCopy: dagger.#Exec & {
imageProdCacheCopy: core.#Exec & {
input: assetsDigest.output
mounts: (depsCacheMount & {depsCache: dest: "/mnt/app/deps/"} )
mounts: (buildCacheProdMount & {buildCacheProd: dest: "/mnt/app/_build/prod"} )
args: ["bash", "-c", "cp -Rp /mnt/app/deps/* /app/deps/ && cp -Rp /mnt/app/_build/prod/* /app/_build/prod/"]
}
imageProdDockerCopy: dagger.#Copy & {
imageProdDockerCopy: core.#Copy & {
input: imageProdCacheCopy.output
source: root: inputs.directories.docker.contents
dest: "/"
}
imageProd: dagger.#Build & {
imageProd: core.#Dockerfile & {
source: imageProdDockerCopy.output
dockerfile: path: "/docker/Dockerfile.production"
buildArg: {

View File

@@ -19,7 +19,7 @@ actions: {
// workdir: _
// // FIXME: remove copy-pasta
// mounts: nodeModules: {
// contents: dagger.#CacheDir & {
// contents: core.#CacheDir & {
// // FIXME: do we need an ID here?
// id: "\(mix.app)_assets_node_modules"
// // FIXME: does this command need write access to node_modules cache?
@@ -55,7 +55,7 @@ actions: {
// }
// // FIXME: move this to a reusable def (yarn package? or private?)
// mounts: nodeModules: {
// contents: dagger.#CacheDir & {
// contents: core.#CacheDir & {
// // FIXME: do we need an ID here?
// id: "\(mix.app)_assets_node_modules"
// // FIXME: will there be multiple writers?

View File

@@ -67,7 +67,7 @@ import (
}
if cache.deps != null {
mounts: deps: {
contents: dagger.#CacheDir & {
contents: core.#CacheDir & {
id: "\(app.name)_deps"
concurrency: cache.deps
}
@@ -76,7 +76,7 @@ import (
}
if cache.build != null {
mounts: buildCache: {
contents: dagger.#CacheDir & {
contents: core.#CacheDir & {
id: "\(app.name)_build_\(env)"
concurrency: cache.build
}

View File

@@ -2,6 +2,7 @@ package todoapp
import (
"dagger.io/dagger"
"dagger.io/dagger/core"
"universe.dagger.io/alpine"
"universe.dagger.io/bash"
"universe.dagger.io/docker"
@@ -9,7 +10,7 @@ import (
)
dagger.#Plan & {
_nodeModulesMount: "/src/node_modules": dagger.#Mount & {
_nodeModulesMount: "/src/node_modules": {
dest: "/src/node_modules"
type: "cache"
contents: dagger.#CacheDir & {
@@ -53,7 +54,7 @@ dagger.#Plan & {
bash.#Run & {
workdir: "/src"
mounts: {
"/cache/yarn": dagger.#Mount & {
"/cache/yarn": {
dest: "/cache/yarn"
type: "cache"
contents: dagger.#CacheDir & {
@@ -89,7 +90,7 @@ dagger.#Plan & {
"""#
}
contents: dagger.#Subdir & {
contents: core.#Subdir & {
input: run.output.rootfs
path: "/src/build"
}