@toa.io/operations 0.8.0-canary.2 → 0.8.0-dev.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "0.8.0-canary.2",
+  "version": "0.8.0-dev.4",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -26,10 +26,10 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/filesystem": "1.1.0-canary.2",
-    "@toa.io/generic": "0.11.0-canary.2",
-    "@toa.io/yaml": "0.8.0-canary.2",
+    "@toa.io/filesystem": "1.1.0-dev.4",
+    "@toa.io/generic": "0.11.0-dev.3",
+    "@toa.io/yaml": "0.8.0-dev.4",
     "execa": "5.1.1"
   },
-  "gitHead": "a80d81d4d9da9fec07606154c959dd6512de4c76"
+  "gitHead": "24d68d70a56717f2f4441cc9884a60f9fee0863e"
 }

package/readme.md

@@ -7,9 +7,24 @@
 #### Build Options
 
 ```yaml
+# context.toa.yaml
+
 registry:
   build:
     arguments: [NPM_TOKEN]
+    run: echo //npm.pkg.github.com/:_authToken=${NPM_TOKEN} > .npmrc
+```
+
+`arguments` is a list of environemt varialbes to be passed to `docker build`.
+
+`run` is a command(s) to be executed during build. Multiline is supported.
+
+```yaml
+# context.toa.yaml
+
+registry:
+  build:
     run: |
-      echo //npm.pkg.github.com/:_authToken=${NPM_TOKEN} > .npmrc
+      echo test > .test
+      rm .test
 ```

package/src/deployment/images/composition.Dockerfile

@@ -1,7 +1,9 @@
 FROM node:18.16.0-alpine3.17
 
+{{build.arguments}}
+
 ENV NODE_ENV=production
-RUN if [ {{runtime.egistry}} != undefined ]; then npm set registry {{runtime.registry}}; fi
+RUN if [ {{runtime.registry}} != undefined ]; then npm set registry {{runtime.registry}}; fi
 RUN if [ {{runtime.proxy}} != undefined ]; then npm set proxy {{runtime.proxy}}; fi
 RUN npm i -g @toa.io/runtime@{{runtime.version}}
 
@@ -11,6 +13,6 @@ ADD . .
 # run 'npm i' in each component
 RUN find . -maxdepth 1 -type d \( ! -name . \) -exec /bin/sh -c "cd '{}' && if [ -f package.json ]; then npm i; fi" \;
 
-RUN {{build.command}}
+{{build.run}}
 
 CMD toa compose *

package/src/deployment/images/image.js

@@ -46,8 +46,7 @@ class Image {
     this.#runtime = runtime
     this.#type = this.constructor.name.toLowerCase()
 
-    this.#values.runtime = runtime
-    this.#values.build = overwrite(this.#values.build, registry.build)
+    this.#setValues()
   }
 
   tag () {
@@ -89,6 +88,14 @@ class Image {
     return path
   }
 
+  #setValues () {
+    this.#values.runtime = this.#runtime
+    this.#values.build = overwrite(this.#values.build, this.#registry.build)
+
+    if (this.#values.build.arguments !== undefined) this.#values.build.arguments = createArguments(this.#values.build.arguments)
+    if (this.#values.build.run !== undefined) this.#values.build.run = createRunCommands(this.#values.build.run)
+  }
+
   /**
    * @param key {string}
    * @returns {string}
@@ -100,4 +107,25 @@ class Image {
   }
 }
 
+function createRunCommands (input) {
+  const lines = input.split('\n')
+
+  return lines.reduce((commands, command) => {
+    commands += '\nRUN ' + command
+
+    return commands
+  }, '')
+}
+
+function createArguments (variables) {
+  const args = []
+
+  for (const variable of variables) {
+    args.push('ARG ' + variable)
+    args.push(`ENV ${variable}=$${variable}`)
+  }
+
+  return args.join('\n')
+}
+
 exports.Image = Image

package/src/deployment/images/image.test.js

@@ -11,6 +11,8 @@ beforeEach(() => {
 })
 
 it('should assign url', () => {
+  instance.tag()
+
   expect(instance.reference).toEqual(`${fixtures.registry.base}/${fixtures.scope}/class-${fixtures.name}:${fixtures.version}`)
 })
 

package/src/deployment/registry.js

@@ -84,6 +84,10 @@ class Registry {
 
     const multiarch = this.#registry.platforms !== null
 
+    if (this.#registry.build?.arguments !== undefined) {
+      for (const arg of this.#registry.build.arguments) args.push('--build-arg', `${arg}=${process.env[arg]}`)
+    }
+
     if (multiarch) {
       const platform = this.#registry.platforms.join(',')
 

package/types/deployment/images/image.d.ts

@@ -4,6 +4,8 @@ declare namespace toa.deployment.images {
     readonly reference: string
     readonly context: string
 
+    tag(): void
+
     prepare(root: string): Promise<string>
   }