@toa.io/operations 0.24.0-alpha.14 → 0.24.0-alpha.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "0.24.0-alpha.14",
+  "version": "0.24.0-alpha.16",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -27,12 +27,12 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/filesystem": "0.24.0-alpha.14",
-    "@toa.io/generic": "0.24.0-alpha.14",
-    "@toa.io/norm": "0.24.0-alpha.14",
-    "@toa.io/yaml": "0.24.0-alpha.14",
+    "@toa.io/filesystem": "0.24.0-alpha.16",
+    "@toa.io/generic": "0.24.0-alpha.16",
+    "@toa.io/norm": "0.24.0-alpha.16",
+    "@toa.io/yaml": "0.24.0-alpha.16",
     "execa": "5.1.1",
     "fs-extra": "11.1.1"
   },
-  "gitHead": "ffa777fa0c5fd43bad15a9f94b1fa74c486ec172"
+  "gitHead": "dbfea6013c1aed5be6f18f120fa85f1bb46e153c"
 }

package/src/deployment/images/composition.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.9.0-alpine3.18
+FROM {{build.image}}
 
 {{build.arguments}}
 

package/src/deployment/images/composition.js

@@ -9,22 +9,15 @@ const { Image } = require('./image')
 class Composition extends Image {
   dockerfile = join(__dirname, 'composition.Dockerfile')
 
-  /** @type {string} */
   #name
-
-  /** @type {toa.norm.Component[]} */
+  #image
   #components
 
-  /**
-   * @param {string} scope
-   * @param {toa.norm.context.Runtime} runtime
-   * @param {toa.norm.context.Registry} registry
-   * @param {toa.norm.context.Composition} composition
-   */
   constructor (scope, runtime, registry, composition) {
     super(scope, runtime, registry)
 
     this.#name = composition.name
+    this.#image = composition.image
     this.#components = composition.components
   }
 
@@ -38,6 +31,24 @@ class Composition extends Image {
     return hash(tags.join(';'))
   }
 
+  get base () {
+    if (this.#image !== undefined)
+      return this.#image
+
+    let image = null
+
+    for (const component of this.#components) {
+      const value = component.build?.image
+
+      if (image !== null && image !== value)
+        throw new Error(`Composition '${this.#name}' requires different base images for its components. Specify base image for the composition in the context.`)
+
+      image = value
+    }
+
+    return image ?? undefined
+  }
+
   async prepare (root) {
     const context = await super.prepare(root)
 

package/src/deployment/images/image.js

@@ -13,36 +13,21 @@ const fs = require('fs-extra')
 class Image {
   context
   reference
-
-  /**
-   * @protected
-   * @type {string}
-   */
   dockerfile
 
-  /** @type {string} */
   #scope
-
-  /** @type {toa.norm.context.Registry} */
   #registry
-
-  /** @type {toa.norm.context.Runtime} */
   #runtime
+  #values = {
+    build: {
+      image: 'node:20.9.0-alpine3.18'
+    }
+  }
 
-  /** @type {{ runtime?: Partial<toa.norm.context.Runtime>, build: object }} */
-  #values = { build: { command: 'echo hello' } }
-
-  /**
-   * @param {string} scope
-   * @param {toa.norm.context.Runtime} runtime
-   * @param {toa.norm.context.Registry} registry
-   */
   constructor (scope, runtime, registry) {
     this.#scope = scope
     this.#registry = registry
     this.#runtime = runtime
-
-    this.#setValues()
   }
 
   tag () {
@@ -51,23 +36,17 @@ class Image {
     this.reference = posix.join(this.#registry.base ?? '', this.#scope, `${this.name}:${tag}`)
   }
 
-  /**
-   * @abstract
-   * @protected
-   * @type {string}
-   */
   get name () {}
 
-  /**
-   * @abstract
-   * @protected
-   * @type {string}
-   */
   get version () {}
 
+  get base () {}
+
   async prepare (root) {
     if (this.dockerfile === undefined) throw new Error('Dockerfile isn\'t specified')
 
+    this.#setValues()
+
     const path = join(root, `${this.name}.${this.version}`)
 
     await fs.ensureDir(path)
@@ -88,6 +67,11 @@ class Image {
     this.#values.runtime = this.#runtime
     this.#values.build = overwrite(this.#values.build, this.#registry.build)
 
+    const image = this.base
+
+    if (image !== undefined)
+      this.#values.build.image = image
+
     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)
   }