compile when needed

Author: kla

src/container.ts

@@ -1,6 +1,8 @@
 import { csvKeyValuePairs, exit } from '~/utils'
 import docker from '~/docker'
+import setup from '~/setup'
 import Hooks from '~/hooks'
+import Staxfile from '~/staxfile'
 
 interface FindOptions {
   warn?: boolean
@@ -10,6 +12,7 @@ interface FindOptions {
 export default class Container {
   public attributes: Record<string, any>
   private _labels: Record<string, string>
+  private _composeFile: string
   private hooks: Hooks
 
   constructor(attributes: Record<string, any>) {
@@ -25,6 +28,10 @@ export default class Container {
     return this.attributes.ID
   }
 
+  get staxfile(): string {
+    return this.labels['dev.stax.staxfile']
+  }
+
   get app(): string {
     return this.labels['dev.stax.app']
   }
@@ -65,6 +72,11 @@ export default class Container {
     return this.labels['com.docker.compose.project.config_files']
   }
 
+  get composeFile(): string {
+    this._composeFile ||= new Staxfile(this.staxfile).compile().composeFile
+    return this._composeFile
+  }
+
   static all(contextName: string): Container[] {
     return docker.ps(contextName)
       .map(attributes => new Container(attributes))
@@ -85,23 +97,23 @@ export default class Container {
   }
 
   async down() {
-    return docker.compose(this.contextName, 'stop', this.name)
+    return docker.compose(this.contextName, 'stop', this.composeFile)
   }
 
   async up() {
-    return docker.compose(this.contextName, 'start', this.name, { exit: true })
+    return docker.compose(this.contextName, 'start', this.composeFile, { exit: true })
   }
 
   async remove() {
-    return docker.compose(this.contextName, 'rm --stop --force --volumes', this.name)
+    return docker.compose(this.contextName, 'rm --stop --force --volumes', this.composeFile)
   }
 
   async exec(command: string) {
     return docker.container(`exec -it ${this.name} ${command}`)
   }
 
   async rebuild() {
-    await docker.compose(this.contextName, `up --detach --force-recreate ${this.name}`, this.configFile, { exit: true })
+    setup(this.contextName, this.staxfile)
     this.hooks.onPostBuild()
   }
 

src/docker.ts

@@ -1,19 +1,13 @@
-import { exit, verifyFile } from '~/utils'
+import { verifyFile } from '~/utils'
 import { run, capture } from '~/shell'
-import Container from '~/container'
 
-async function compose(contextName: string, command: string, path: string, options: Record<string,any> = {}) {
+async function compose(contextName: string, command: string, composeFile: string, options: Record<string,any> = {}) {
   const base = `docker compose --project-name ${contextName}`
 
   options = { append: true, ...options, env: { COMPOSE_IGNORE_ORPHANS: "1" } }
+  options.exit && verifyFile(composeFile)
 
-  // See if  path is actually a container name
-  if (Container.find(contextName, path))
-    return run(`${base} ${command}${options.append ? ` ${path}` : ''}`, options)
-
-  options.exit && verifyFile(path)
-
-  return run(`${base} -f ${path} ${command}`, options)
+  return run(`${base} -f ${composeFile} ${command}`, options)
 }
 
 async function container(command: string) {

src/setup.ts

@@ -1,8 +1,7 @@
 import { readFileSync } from 'fs'
 import { load } from 'js-yaml'
-import { exit, isDirectory, fileExists, isFile } from '~/utils'
+import { exit, isDirectory, fileExists } from '~/utils'
 import App from '~/app'
-import Container from '~/container'
 import Staxfile from '~/staxfile'
 import docker from '~/docker'