stoobly-agent 1.2.3__py3-none-any.whl → 1.4.0__py3-none-any.whl

stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -1,8 +1,9 @@
+import os
 import pdb
 
 from urllib.parse import urlparse
 
-from ...constants import SERVICE_HOSTNAME, SERVICE_PORT
+from ...constants import SERVICE_HOSTNAME, SERVICE_PORT, STOOBLY_CERTS_DIR
 from .builder import WorkflowBuilder
 
 class ReverseProxyDecorator():
@@ -22,7 +23,6 @@ class ReverseProxyDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
       '--proxy-mode', config.proxy_mode,
@@ -30,6 +30,10 @@ class ReverseProxyDecorator():
       '--ssl-insecure'
     ]
 
+    if config.scheme == 'https':
+      command.append('--certs')
+      command.append(os.path.join(STOOBLY_CERTS_DIR, f"{SERVICE_HOSTNAME}-joined.pem"))
+
     services = self.workflow_builder.services
     proxy_name = self.workflow_builder.proxy
     proxy_service = services.get(proxy_name) or {}

stoobly_agent/app/cli/scaffold/hosts_file_manager.py

@@ -0,0 +1,112 @@
+import os
+import pdb
+import sys
+
+from dataclasses import dataclass
+from typing import Union
+
+SCAFFOLD_HOSTS_DELIMITTER_BEGIN = "##### STOOBLY SCAFFOLD HOSTS BEGIN #####\n"
+SCAFFOLD_HOSTS_DELIMITTER_END = "##### STOOBLY SCAFFOLD HOSTS END #####\n"
+
+class HostsFileManager():
+
+  @dataclass
+  class IpAddressToHostnames:
+    ip_address: str
+    hostnames: list[str]
+
+  def __get_hosts_file_path(self) -> str:
+    file_path = '/etc/hosts'
+    if not os.path.exists(file_path):
+      print(f"Error: File {file_path} not found.", file=sys.stderr)
+      sys.exit(1)
+    return file_path
+
+  # Split IP address and hostnames. Don't include inline comments
+  def __split_hosts_line(self, line: str) -> list[str]:
+    ip_addr_hosts_split = line.split('#')[0].split()
+    return ip_addr_hosts_split
+
+  # Parses hosts file and returns a mapping of IP address to hostnames in a list.
+  def get_hosts(self) -> list[IpAddressToHostnames]:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    if not hosts_file_path:
+      return []
+
+    with open(hosts_file_path, 'r') as f:
+      hostlines = f.readlines()
+
+    # Skip comments and empty lines
+    hostlines = [line.strip() for line in hostlines
+                 if not line.startswith('#') and line.strip() != '']
+
+    hosts = []
+    for line in hostlines:
+      ip_addr_hosts_split = self.__split_hosts_line(line)
+      ip_address = ip_addr_hosts_split[0]
+      hostnames = ip_addr_hosts_split[1:]
+      ipAddressToHostnames = self.IpAddressToHostnames(ip_address, hostnames)
+
+      hosts.append(ipAddressToHostnames)
+
+    return hosts
+
+  def find_host(self, hostname) -> Union[IpAddressToHostnames, None]:
+    hosts = self.get_hosts()
+
+    for mapping in hosts:
+      if ((mapping.ip_address == '0.0.0.0' or mapping.ip_address == '127.0.0.1') and
+        hostname in mapping.hostnames):
+
+        return mapping
+
+    return None
+
+  def install_hostnames(self, hostnames: list[str]) -> None:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    self.remove_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END
+    )
+
+    with open(hosts_file_path, 'a+') as f:
+      if SCAFFOLD_HOSTS_DELIMITTER_BEGIN not in f.read():
+        f.write(SCAFFOLD_HOSTS_DELIMITTER_BEGIN)
+
+      for hostname in hostnames:
+        print(f"Installing hostname {hostname} to {hosts_file_path}")
+        f.write(f"127.0.0.1 {hostname}\n")
+        f.write(f"::1       {hostname}\n")
+
+      if SCAFFOLD_HOSTS_DELIMITTER_END not in f.read():
+        f.write(SCAFFOLD_HOSTS_DELIMITTER_END)
+
+  def uninstall_hostnames(self) -> None:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    self.remove_lines_between_markers(
+      hosts_file_path, SCAFFOLD_HOSTS_DELIMITTER_BEGIN, SCAFFOLD_HOSTS_DELIMITTER_END
+    ) 
+
+    print(f"Uninstalled hostnames from {hosts_file_path}")
+
+  def remove_lines_between_markers(self, file_path, start_marker, end_marker):
+    with open(file_path, "r") as file:
+      lines = file.readlines()
+    
+    inside_block = False
+    filtered_lines = []
+
+    for line in lines:
+      if start_marker in line:
+        inside_block = True
+        continue  # Skip the start marker line
+      if end_marker in line:
+        inside_block = False
+        continue  # Skip the end marker line
+      if not inside_block:
+        filtered_lines.append(line)
+
+    with open(file_path, "w") as file:
+      file.writelines(filtered_lines)

stoobly_agent/app/cli/scaffold/service.py

@@ -14,12 +14,11 @@ class Service():
 
   @property
   def dir_path(self):
-    return os.path.join(self.app.namespace_path, self.service_name)
+    return os.path.join(self.app.scaffold_namespace_path, self.service_name)
 
   @property
   def service_name(self):
     return self.__service_name
 
-  @property
   def workflow_dir_path(self, workflow_name: str):
     return os.path.join(self.dir_path, workflow_name)

stoobly_agent/app/cli/scaffold/service_command.py

@@ -33,7 +33,7 @@ class ServiceCommand(AppCommand):
   @property
   def service_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.service_relative_path
     )
 

stoobly_agent/app/cli/scaffold/service_config.py

@@ -4,7 +4,6 @@ import pdb
 from .config import Config
 from .constants import (
   SERVICE_DETACHED_ENV,
-  SERVICE_DOCKER_COMPOSE_PATH_ENV,
   SERVICE_HOSTNAME_ENV,
   SERVICE_PRIORITY_ENV,
   SERVICE_PORT_ENV,
@@ -18,7 +17,6 @@ class ServiceConfig(Config):
     super().__init__(dir)
 
     self.__detached = None
-    self.__docker_compose_path = None
     self.__hostname = None
     self.__port = None
     self.__priority = None
@@ -53,14 +51,6 @@ class ServiceConfig(Config):
   def detached(self, v):
     self.__detached = v
 
-  @property
-  def docker_compose_path(self):
-    return self.__docker_compose_path
-
-  @docker_compose_path.setter
-  def docker_compose_path(self, v):
-    self.__docker_compose_path = v
-
   @property
   def hostname(self):
     return (self.__hostname or '').strip()
@@ -120,19 +110,25 @@ class ServiceConfig(Config):
     config = config or self.read()
 
     self.detached = config.get(SERVICE_DETACHED_ENV)
-    self.docker_compose_path = config.get(SERVICE_DOCKER_COMPOSE_PATH_ENV)
     self.hostname = config.get(SERVICE_HOSTNAME_ENV)
     self.port = config.get(SERVICE_PORT_ENV)
     self.priority = config.get(SERVICE_PRIORITY_ENV)
     self.proxy_mode = config.get(SERVICE_PROXY_MODE_ENV)
     self.scheme = config.get(SERVICE_SCHEME_ENV)
 
+  def to_dict(self):
+    return {
+      'detached': self.detached,
+      'hostname': self.hostname,
+      'port': self.port,
+      'priority': self.priority,
+      'proxy_mode': self.proxy_mode,
+      'scheme': self.scheme,
+    }
+
   def write(self):
     config = {}
 
-    if self.docker_compose_path:
-      config[SERVICE_DOCKER_COMPOSE_PATH_ENV] = self.docker_compose_path
-
     if self.hostname:
       config[SERVICE_HOSTNAME_ENV] = self.hostname
 

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -1,28 +1,24 @@
 import os
 import pdb
 import socket
-import ssl
 import time
+
 from collections import Counter
 from pathlib import Path
 
-import requests
 import yaml
 from docker.models.containers import Container
-from requests.adapters import HTTPAdapter
-from urllib3 import Retry
 
 from stoobly_agent.app.cli.scaffold.constants import (
   FIXTURES_FOLDER_NAME,
   STOOBLY_DATA_DIR,
-  STOOBLY_HOME_DIR,
   VIRTUAL_HOST_ENV,
   VIRTUAL_PORT_ENV,
   VIRTUAL_PROTO_ENV,
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
-from stoobly_agent.app.cli.scaffold.hosts_file_reader import HostsFileReader
+from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
 from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
 from stoobly_agent.app.cli.scaffold.validate_command import ValidateCommand
@@ -39,7 +35,9 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
 
     self.workflow_name = kwargs['workflow_name']
     self.hostname = self.service_config.hostname
-    self.service_docker_compose = ServiceDockerCompose(app_dir_path=app.dir_path, target_workflow_name=self.workflow_name, service_name=self.service_name, hostname=self.hostname)
+    self.service_docker_compose = ServiceDockerCompose(
+      app_dir_path=app.dir_path, target_workflow_name=self.workflow_name, service_name=self.service_name, hostname=self.hostname
+    )
 
   @property
   def fixtures_dir_path(self):
@@ -48,7 +46,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   @property
   def workflow_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.workflow_relative_path
     )
   @property
@@ -91,8 +89,8 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   def hostname_exists(self, hostname: str) -> bool:
     print(f"Validating hostname exists in hosts file for hostname: {hostname}")
 
-    hosts_file_reader = HostsFileReader()
-    host_mapping = hosts_file_reader.find_host(hostname)
+    hosts_file_manager = HostsFileManager()
+    host_mapping = hosts_file_manager.find_host(hostname)
     if host_mapping:
       print(f"Correct hosts mapping found for {hostname}")
       return True
@@ -151,7 +149,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
       return
 
     # Check contents of fixtures folder to confirm it's shared
-    fixtures_folder_path = f"{STOOBLY_HOME_DIR}/{self.workflow_name}/{FIXTURES_FOLDER_NAME}"
+    fixtures_folder_path = f"{FIXTURES_FOLDER_NAME}"
     exec_result = container.exec_run(f"ls -A {fixtures_folder_path}")
     output = exec_result.output
 

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context

@@ -1,8 +1,6 @@
-FROM stoobly/agent:1.2
+FROM stoobly/agent:1.4
 
 ARG USER_ID
 
 # Change user id of stoobly user to that of host's user id
-RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi
-
-COPY --chown=stoobly:stoobly . .
+RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -4,11 +4,13 @@
 # STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored
 # STOOBLY_CERTS_DIR: path to a folder to store certs
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder
-# STOOBLY_WORKFLOW_OPTIONS: extra options to pass to 'stoobly-agent scaffold workflow' commands
+# STOOBLY_WORKFLOW_SERVICE_OPTIONS: extra --service options to pass  'stoobly-agent scaffold workflow' commands
 
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 EXEC_WORKFLOW_NAME := exec
+PULL_OPTION := $(if $(STOOBLY_IMAGE_USE_LOCAL),,--pull)
+USER_ID := $(shell id -u)
 
 CONTEXT_DIR_DEFAULT := $(realpath $(DIR)/../..)
 
@@ -17,36 +19,57 @@ app_dir=$$(realpath "$${STOOBLY_APP_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$$(realpath ~)/.mitmproxy}")
 certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
-workflow_options=$${STOOBLY_WORKFLOW_OPTIONS:+$$STOOBLY_WORKFLOW_OPTIONS }
+
+context_dir_option=--context-dir-path $(context_dir)
+user_id_option=--user-id $(USER_ID)
+stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
+workflow_down_options=$(user_id_option)
+workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
+workflow_up_options=$(context_dir_option) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) --from-make $(user_id_option)
 
 app_data_dir=$(app_dir)/.stoobly
-data_dir=$(context_dir)/.stoobly
+app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
+data_dir=$(context_dir)/.stoobly
+dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
+docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
+workflow_run_script=$(app_data_dir)/tmp/run.sh
 
 # Commands
-docker_compose_command=docker compose
+docker_command=docker
+docker_compose_command=$(docker_command) compose
+exec_env=export CA_CERTS_DIR="$(ca_certs_dir)" && export USER_ID=$(USER_ID)
+exec_up=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
 source_env=set -a; [ -f .env ] && source .env; set +a
 
-docker_compose_file_path=$(app_data_dir)/docker/stoobly-ui/exec/.docker-compose.exec.yml
+# Build base image
+stoobly_exec_build=$(docker_command) build $(stoobly_exec_build_args) $(app_namespace_dir)
+stoobly_exec_build_args=-f "$(dockerfile_path)" -t stoobly.$(USER_ID) --build-arg USER_ID=$(USER_ID) $(PULL_OPTION) --quiet
 
-stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --remove-orphans
-stoobly_exec_build=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_build_args)
-stoobly_exec_build_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) build --pull --quiet
-stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
+# Exec any
+stoobly_exec=$(stoobly_exec_build) && $(stoobly_exec_env) && $(exec_up)
+stoobly_exec_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(context_dir)" 
 
-stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
+# Exec workflow run
+# Because scaffold is stored in the application source code directory, 
+# when running a scaffold command from within a container,
+# it needs access to $(app_dir) rather than $(context_dir)
+stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) && $(exec_up)
+stoobly_exec_run_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(app_dir)"
 
-# Because scaffold is stored in the APP_DIR, when running a scaffold command from within a container,
-# it needs access to APP_DIR rather than CONTEXT_DIR
-stoobly_exec_run=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && CONTEXT_DIR=$(app_dir) $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
-
-workflow_run_script=$(app_data_dir)/tmp/run.sh
-workflow_run_env=export APP_DIR="$(app_dir)" && export CERTS_DIR="$(certs_dir)" && export CONTEXT_DIR="$(context_dir)"
-workflow_run=$(workflow_run_env) && $(source_env) && bash "$(workflow_run_script)"
+# Workflow run
+workflow_run=$(source_env) && bash "$(workflow_run_script)"
 
+ca-cert/install: stoobly/install
+	@echo "Running stoobly-agent ca-cert install..."; \
+	stoobly-agent ca-cert install
 certs:
 	@export EXEC_COMMAND=bin/.mkcert && \
 	$(stoobly_exec)
+command/install:
+	$(eval COMMAND=install)
+command/uninstall:
+	$(eval COMMAND=uninstall)
 nameservers: tmpdir
 	@if [ -f /etc/resolv.conf ]; then \
 		nameserver=$$(grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' /etc/resolv.conf) && \
@@ -56,7 +79,8 @@ nameservers: tmpdir
 		fi; \
 		echo "$$nameserver" > $(app_tmp_dir)/.nameservers; \
 	else \
-		echo "/etc/resolv.conf not found."; \
+		echo "/etc/resolv.conf not found." >&2; \
+		exit 1; \
 	fi
 intercept/disable:
 	@export EXEC_COMMAND=bin/.disable && \
@@ -65,42 +89,24 @@ intercept/enable:
 	@export EXEC_COMMAND=bin/.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: nameservers
-	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="mock" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-mock/logs: 
-	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="mock" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-mock/down:
-	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="mock" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-record: nameservers
-	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="record" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-record/logs: 
-	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="record" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
-record/down:
-	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="record" && \
-	$(stoobly_exec_run) && \
-	$(workflow_run)
+mock: workflow/mock workflow/hostname/install nameservers workflow/up
+mock/services: workflow/mock workflow/services
+mock/logs: workflow/mock workflow/logs
+mock/down: workflow/mock workflow/down workflow/hostname/uninstall
+pipx/install:
+	@if ! command -v pipx >/dev/null 2>&1; then \
+		echo "pipx is not installed. Installing pipx..."; \
+		python3 -m pip install --user pipx && python3 -m pipx ensurepath; \
+	fi
+python/validate:
+	@if ! python3 --version | grep -Eq 'Python 3\.(10|11|12)'; then \
+		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
+		exit 1; \
+	fi
+record: workflow/record workflow/hostname/install nameservers workflow/up
+record/down: workflow/record workflow/down workflow/hostname/uninstall
+record/services: workflow/record workflow/services
+record/logs: workflow/record workflow/logs
 scenario/create:
 # Create a scenario
 	@export EXEC_COMMAND=bin/.create && \
@@ -130,23 +136,57 @@ scenario/snapshot:
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
-test:
-	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="test" && \
+stoobly/install: python/validate pipx/install 
+	@if ! pipx list 2> /dev/null | grep -q 'stoobly-agent'; then \
+		echo "stoobly-agent not found. Installing..."; \
+		pipx install stoobly-agent; \
+	fi
+test: workflow/test workflow/up
+test/services: workflow/test workflow/services
+test/logs: workflow/test workflow/logs
+test/down: workflow/test workflow/down
+tmpdir:
+	@mkdir -p $(app_tmp_dir)
+workflow/down:
+	@export EXEC_COMMAND=bin/.down && \
+	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
-test/logs: 
+workflow/hostname: stoobly/install
+	@read -p "Do you want to $(COMMAND) hostname(s) in /etc/hosts? (y/N) " confirm && \
+	if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
+		CURRENT_VERSION=$$(stoobly-agent --version); \
+		REQUIRED_VERSION="1.4.0"; \
+		if [ "$$(printf '%s\n' "$$REQUIRED_VERSION" "$$CURRENT_VERSION" | sort -V | tail -n 1)" = "$$CURRENT_VERSION" ]; then \
+			echo "stoobly-agent version $$REQUIRED_VERSION required. Please run: pipx upgrade stoobly-agent"; \
+			exit 1; \
+		fi; \
+		echo "Running stoobly-agent scaffold hostname $(COMMAND)..."; \
+		stoobly-agent scaffold hostname $(COMMAND) --app-dir-path $(app_dir) --workflow $(WORKFLOW); \
+	fi
+workflow/hostname/install: command/install workflow/hostname
+workflow/hostname/uninstall: command/uninstall workflow/hostname  
+workflow/logs:
 	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="test" && \
+	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
-test/down:
-	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
-	export EXEC_ARGS="test" && \
+workflow/mock:
+	$(eval WORKFLOW=mock)
+workflow/record:
+	$(eval WORKFLOW=record)
+workflow/services:
+	@export EXEC_COMMAND=bin/.services && \
+	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
+	$(stoobly_exec_run)
+workflow/test:
+	$(eval WORKFLOW=test)
+workflow/up:
+	@export EXEC_COMMAND=bin/.up && \
+	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_service_options) $(options)" && \
+	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
-	$(workflow_run)
-tmpdir:
-	@mkdir -p $(app_tmp_dir)
+	$(workflow_run)

stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml

@@ -1,18 +1,13 @@
 services:
-  ui_base:
-    extends:
-      service: context_base 
-    volumes:
-      - ${CA_CERTS_DIR}:/home/stoobly/.mitmproxy   
   context_base:
-    build:
-      args:
-        USER_ID: ${USER_ID}
-      dockerfile: ./.Dockerfile.context
+    extends:
+      service: stoobly_base
     volumes:
       - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
-  proxy_base:
-    build:
-      dockerfile: ./.Dockerfile.proxy
+  stoobly_base:
+    image: stoobly.${USER_ID}
+  ui_base:
     extends:
-      service: context_base
+      service: context_base 
+    volumes:
+      - ${CA_CERTS_DIR}:/home/stoobly/.mitmproxy

stoobly_agent/app/cli/scaffold/templates/app/Makefile

@@ -1,3 +1,3 @@
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
-include $(DIR)/.Makefile
+include $(DIR).Makefile

stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml

@@ -1,11 +1,15 @@
 services:
   build.init_base:
-    command: ['bin/.init']
+    command: 
+    - bin/.init
     extends:
       file: ../.docker-compose.base.yml
-      service: proxy_base
+      service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
   build.configure_base:
-    command: ['bin/.configure']
+    command: 
+    - bin/.configure
     extends:
       file: ../.docker-compose.base.yml
-      service: proxy_base
+      service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml

@@ -1,22 +1,18 @@
 services:
   build.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     extends:
       file: ../.docker-compose.base.yml
       service: build.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock
   build.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       build.init:
         condition: service_completed_successfully
     extends:
       file: ../.docker-compose.base.yml
       service: build.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.configure

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent config reset
 
 cd $(dirname -- "$0") && ./configure

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.init

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent snapshot apply
 
 cd $(dirname -- "$0") && ./init

stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml

@@ -1,22 +1,18 @@
 services:
   build.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     extends:
       file: ../.docker-compose.base.yml
       service: build.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - record
   build.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       build.init:
         condition: service_completed_successfully
     extends:
       file: ../.docker-compose.base.yml
       service: build.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - record