stoobly-agent 1.6.6__tar.gz → 1.7.0__tar.gz

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.6.6
+Version: 1.7.0
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "1.6.6"
+version = "1.7.0"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.6.6'
+VERSION = '1.7.0'

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/constants.py

@@ -4,6 +4,7 @@ from typing import Literal
 
 from stoobly_agent.config.data_dir import CERTS_DIR_NAME, DATA_DIR_NAME
 
+APP_DIR = '${APP_DIR}'
 APP_DIR_ENV = 'APP_DIR'
 APP_NETWORK_ENV = 'APP_NETWORK'
 APP_NAME_ENV = 'APP_NAME'

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -10,6 +10,7 @@ DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
 DOCKER_COMPOSE_NETWORKS = '.docker-compose.networks.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
+GATEWAY_NGINX_TEMPLATE = 'nginx.tmpl'
 
 # TODO: add scaffold container name templates here
 

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -1,8 +1,17 @@
 import os
 import pdb
 
+from typing import List
+
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
 from ...app_config import AppConfig
-from ...constants import WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
+from ...constants import (
+  APP_DIR, DOCKER_NAMESPACE, SERVICE_NAME, SERVICE_NAME_ENV, 
+  SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
+  STOOBLY_HOME_DIR, STOOBLY_HOME_DIR, 
+  WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
+)
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -20,16 +29,16 @@ class ServiceBuilder(Builder):
     self.app_builder = app_builder
 
     self.__config = config
+    self.__env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV]
     self.__service_name = os.path.basename(service_path)
+    self.__working_dir = os.path.join(
+      STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, SERVICE_NAME, WORKFLOW_NAME
+    )
 
   @property
   def app_base(self):
     return f"{self.service_name}.app_base"
 
-  @property
-  def init_base(self):
-    return f"{self.service_name}.init_base"
-
   @property
   def config(self):
     return self.__config
@@ -49,6 +58,14 @@ class ServiceBuilder(Builder):
     else:
       return self.app_builder.context_base
 
+  @property
+  def init_base(self):
+    return f"{self.service_name}.init_base"
+
+  @property
+  def init_base_service(self):
+    return self.services.get(self.init_base)
+
   @property
   def proxy_base(self):
     return f"{self.service_name}.proxy_base"
@@ -74,15 +91,45 @@ class ServiceBuilder(Builder):
     if not self.config.hostname:
       return
 
-    self.with_service(self.proxy_base, {
+    environment = { **self.env_dict() }
+    volumes = []
+
+    environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
+    environment['VIRTUAL_PORT'] = SERVICE_PORT
+    environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
+
+    if self.config.detached:
+      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
+    base = {
+      'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
       },
-    })
+      'working_dir': self.__working_dir,
+    }
+
+    if len(volumes):
+      base['volumes'] = volumes
+
+    self.with_service(self.proxy_base, base)
 
   def build_init_base(self):
-    environment = {}
+    environment = { **self.env_dict() }
+    volumes = [f"{APP_DIR}:/app"]
+
+    if self.config.hostname:
+      self.__with_url_environment(environment)
+
+    if self.config.detached:
+      # Mount named volume
+      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
+
+      # Mount docker folder
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
     self.with_service(self.init_base, {
       'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
       'environment': environment,
@@ -90,18 +137,47 @@ class ServiceBuilder(Builder):
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
       },
+      'volumes': volumes,
+      'working_dir': self.__working_dir,
     })
 
   def build_configure_base(self):
-    environment = {}
-    self.with_service(self.configure_base, {
+    environment = { **self.env_dict() }
+    volumes = []
+
+    if self.config.hostname:
+      self.__with_url_environment(environment)
+
+    if self.config.detached:
+      volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/${DATA_DIR_NAME}")
+      volumes.append(f"../..:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+
+    base = {
       'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
-      }
-    })
+      },
+      'working_dir': self.__working_dir,
+    }
+
+    if len(volumes):
+      base['volumes'] = volumes
+
+    self.with_service(self.configure_base, base)
+
+  def env_dict(self):
+    env = {}
+    for e in self.__env:
+      env[e] = '${' + e + '}'
+    return env
+
+  def with_env(self, v: List[str]): 
+    if not isinstance(v, list):
+      return self
+    self.__env += v
+    return self
 
   def write(self):
     self.build_init_base()
@@ -117,4 +193,13 @@ class ServiceBuilder(Builder):
     if self.networks:
       compose['networks'] = self.networks
 
-    super().write(compose)
+    super().write(compose)
+
+  def __with_url_environment(self, environment):
+    environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME
+
+    if self.config.scheme:
+      environment[SERVICE_SCHEME_ENV] = SERVICE_SCHEME
+
+    if self.config.port:
+      environment[SERVICE_PORT_ENV] = SERVICE_PORT

stoobly_agent-1.7.0/stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py

@@ -0,0 +1,102 @@
+import os
+import pdb
+import shutil
+import yaml
+
+from typing import List
+
+from stoobly_agent.config.data_dir import DATA_DIR_NAME, TMP_DIR_NAME
+from stoobly_agent.app.cli.scaffold.constants import APP_DIR
+from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
+from stoobly_agent.app.cli.scaffold.docker.constants import APP_INGRESS_NETWORK_NAME, APP_EGRESS_NETWORK_NAME, DOCKER_COMPOSE_BASE, DOCKER_COMPOSE_BASE_TEMPLATE, GATEWAY_NGINX_TEMPLATE
+from stoobly_agent.app.cli.scaffold.templates.constants import CORE_GATEWAY_SERVICE_NAME
+from stoobly_agent.app.cli.scaffold.templates import run_template_path
+
+def configure_gateway(service_paths: List[str], no_publish = False):
+  if len(service_paths) == 0:
+    return
+
+  hostnames, ports = __find_hosts(service_paths)
+
+  service_dir_path = os.path.dirname(service_paths[0])
+  gateway_service_path = os.path.join(service_dir_path, CORE_GATEWAY_SERVICE_NAME)
+  docker_compose_src_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE_TEMPLATE)
+  docker_compose_dest_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE)
+
+  compose = {}
+  with open(docker_compose_src_path, 'r') as fp:
+    compose = yaml.safe_load(fp)
+    services = compose.get('services')
+
+    if not services:
+      return
+    
+    gateway_base = services.get('gateway_base')
+
+    if gateway_base:
+      if not no_publish:
+        gateway_base['ports'] = ports
+
+      app_dir_path = os.path.dirname(os.path.dirname(service_dir_path))
+      __with_no_publish(gateway_base, app_dir_path)
+      __with_networks(gateway_base, hostnames) 
+
+  with open(docker_compose_dest_path, 'w') as fp:
+    yaml.dump(compose, fp) 
+
+def __with_networks(config: dict, hostnames: List[str]):
+  networks = {} 
+  config['networks'] = networks
+  networks[APP_EGRESS_NETWORK_NAME] = {}
+  networks[APP_INGRESS_NETWORK_NAME] = {
+    'aliases': hostnames
+  }
+
+def __with_no_publish(config: dict, app_dir_path: str):
+  if not config['volumes']:
+    config['volumes'] = []
+
+  # Copy nginx.tmpl to .stoobly/tmp
+  nginx_template_src_path = os.path.join(run_template_path(), GATEWAY_NGINX_TEMPLATE)
+  nginx_template_relative_path = os.path.join(DATA_DIR_NAME, TMP_DIR_NAME, GATEWAY_NGINX_TEMPLATE)
+  nginx_template_dest_path = os.path.join(app_dir_path, nginx_template_relative_path)
+
+  if not os.path.exists(os.path.dirname(nginx_template_dest_path)):
+    os.makedirs(os.path.dirname(nginx_template_dest_path), exist_ok=True)
+
+  shutil.copy(nginx_template_src_path, nginx_template_dest_path)
+
+  config['volumes'].append(
+    f"{os.path.join(APP_DIR, nginx_template_relative_path)}:/app/nginx.tmpl:ro"
+  )
+
+  environment = {}
+  if not config['environment']:
+    config['environment'] = environment
+  else:
+    environment = config['environment']
+
+  environment['HTTPS_METHOD'] = 'noredirect'
+
+def __find_hosts(service_paths):
+  hostnames = []
+  ports = []
+  for path in service_paths:
+    config = ServiceConfig(path)
+
+    if not config.hostname:
+      continue
+
+    try:
+      port = int(config.port)
+    except Exception:
+      continue
+    
+    port_mapping = f"{port}:{port}"
+    if port > 0 and port <= 65535 and port_mapping not in ports:
+      ports.append(port_mapping)
+
+    if config.hostname not in hostnames:
+      hostnames.append(config.hostname) 
+
+  return hostnames, ports

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/docker/workflow/builder.py

@@ -1,14 +1,10 @@
 import os
 import pdb
 
-from typing import List
-
-from stoobly_agent.config.data_dir import DATA_DIR_NAME
-
 from ...constants import (
-  COMPOSE_TEMPLATE, DOCKER_NAMESPACE, STOOBLY_HOME_DIR, SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, 
-  SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
-  WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE, WORKFLOW_CONTAINER_INIT_TEMPLATE, WORKFLOW_CONTAINER_PROXY_TEMPLATE, WORKFLOW_NAME_ENV
+  COMPOSE_TEMPLATE, SERVICE_HOSTNAME, 
+  SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
+  WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE, WORKFLOW_CONTAINER_INIT_TEMPLATE, WORKFLOW_CONTAINER_PROXY_TEMPLATE, WORKFLOW_NAME, WORKFLOW_NAME_ENV
 )
 from ..builder import Builder
 from ..service.builder import ServiceBuilder
@@ -21,16 +17,13 @@ class WorkflowBuilder(Builder):
     super().__init__(workflow_path, COMPOSE_TEMPLATE.format(workflow=self.__workflow_name))
 
     self.__context = '../'
-    self.__profiles = [self.__workflow_name]
+    self.__profiles = [WORKFLOW_NAME]
 
     if not service_builder:
       service_path = os.path.dirname(workflow_path)
       service_builder = ServiceBuilder(service_path)
 
     self.__service_builder = service_builder
-    self.__working_dir = os.path.join(
-      STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, self.service_builder.service_name, self.workflow_name
-    )
 
   @property
   def app(self):
@@ -40,10 +33,6 @@ class WorkflowBuilder(Builder):
   def base_compose_file_path(self):
     return os.path.relpath(self.service_builder.compose_file_path, self.dir_path)
 
-  @property
-  def init(self):
-    return WORKFLOW_CONTAINER_INIT_TEMPLATE.format(service_name=self.namespace)
-
   @property
   def config(self):
     return self.service_builder.config
@@ -60,6 +49,10 @@ class WorkflowBuilder(Builder):
   def context_docker_file_path(self):
     return os.path.relpath(self.service_builder.app_builder.context_docker_file_path, self.service_path)
 
+  @property
+  def init(self):
+    return WORKFLOW_CONTAINER_INIT_TEMPLATE.format(service_name=self.namespace)
+
   @property
   def namespace(self):
     return f"{self.service_builder.service_name}"
@@ -97,26 +90,16 @@ class WorkflowBuilder(Builder):
       self.build_proxy() # Depends on configure, must call build_configure first
 
   def build_init(self):
-    environment = { **self.env_dict() }
-    volumes = []
+    # If the init_base service does not exist, we can't extend from it, return
+    if not self.service_builder.init_base_service:
+      return
 
+      return
     service = {
-      'environment': environment,
       'extends': self.service_builder.build_extends_init_base(self.dir_path),
       'profiles': self.profiles,
-      'volumes': volumes,
-      'working_dir': self.__working_dir,
     }
 
-    if self.config.hostname:
-      self.__with_url_environment(environment)
-
-    if self.config.detached:
-      # Mount named volume
-      volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
-      # Mount docker folder
-      volumes.append(f"../..:{STOOBLY_HOME_DIR}/.stoobly/docker")
-
     self.with_service(self.init, service)
 
   def build_configure(self):
@@ -125,30 +108,18 @@ class WorkflowBuilder(Builder):
       return
 
     depends_on = {}
-    environment = { **self.env_dict() }
-    volumes = []
 
     service = {
       'depends_on': depends_on,
-      'environment': environment,
       'extends': self.service_builder.build_extends_configure_base(self.dir_path),
       'profiles': self.profiles,
-      'volumes': volumes,
-      'working_dir': self.__working_dir,
     }
 
-    if self.config.hostname:
-      self.__with_url_environment(environment)
-
     if self.init in self.services:
       depends_on[self.init] = {
         'condition': 'service_completed_successfully',
       }
 
-    if self.config.detached:
-      volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
-      volumes.append(f"../..:{STOOBLY_HOME_DIR}/.stoobly/docker")
-
     self.with_service(self.configure, service)
 
   def build_proxy(self):
@@ -157,18 +128,13 @@ class WorkflowBuilder(Builder):
       return
 
     depends_on = {}
-    environment = { **self.env_dict() }
     networks = {}
-    volumes = []
 
     service = {
       'depends_on': depends_on,
-      'environment': environment,
       'extends': self.service_builder.build_extends_proxy_base(self.dir_path),
       'networks': networks,
       'profiles': self.profiles,
-      'volumes': volumes,
-      'working_dir': self.__working_dir,
     }
 
     if self.configure in self.services:
@@ -180,18 +146,10 @@ class WorkflowBuilder(Builder):
         'condition': 'service_completed_successfully',
       }
 
-    environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
-    environment['VIRTUAL_PORT'] = SERVICE_PORT
-    environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
-
     # Expose this container service to the public network 
     # so that it is accessible to other Stoobly services
     networks[self.egress_network_name] = {}
 
-    if self.config.detached:
-      volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
-      volumes.append(f"../..:{STOOBLY_HOME_DIR}/.stoobly/docker")
-
     self.with_service(self.proxy, service)
 
   def env_dict(self):
@@ -213,12 +171,6 @@ class WorkflowBuilder(Builder):
 
       super().write(compose, dest)
 
-  def with_env(self, v: List[str]): 
-    if not isinstance(v, list):
-      return self
-    self._env += v
-    return self
-
   def write(self):
     compose = {
       'services': self.services,

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/service_create_command.py

@@ -27,6 +27,7 @@ class ServiceCreateCommand(ServiceCommand):
 
   def build(self):
     service_builder = ServiceBuilder(self.service_config)
+    service_builder.with_env(list(self.env_vars))
     service_decorators = []
 
     for service_decorator in service_decorators:
@@ -36,7 +37,6 @@ class ServiceCreateCommand(ServiceCommand):
 
     workflow_kwargs = {
       'app_dir_path': self.app_dir_path,
-      'env': self.env_vars,
       'namespace': self.namespace, 
       'service_name': self.service_name,
     }

stoobly_agent-1.7.0/stoobly_agent/app/cli/scaffold/templates/__init__.py

@@ -0,0 +1,8 @@
+import os
+import pathlib
+
+def __path():
+  return os.path.join(pathlib.Path(__file__).parent.resolve())
+
+def run_template_path():
+  return os.path.join(__path(), 'run')

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml

@@ -6,7 +6,7 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
   build.init_base:
     command: 
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
@@ -14,4 +14,6 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
+    volumes:
+    - ${APP_DIR}:/app
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml

@@ -5,7 +5,7 @@ services:
       service: build.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
+      - ${WORKFLOW_NAME}
   build.configure:
     depends_on:
       build.init:
@@ -15,4 +15,4 @@ services:
       service: build.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
+      - ${WORKFLOW_NAME}

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

@@ -0,0 +1,7 @@
+# Define services here
+#
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
+# profiles:
+#   - mock
+services: {}

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml

@@ -5,7 +5,7 @@ services:
       service: build.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - record
+      - ${WORKFLOW_NAME}
   build.configure:
     depends_on:
       build.init:
@@ -15,4 +15,4 @@ services:
       service: build.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - record
+      - ${WORKFLOW_NAME}

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

@@ -0,0 +1,7 @@
+# Define services here
+#
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'record' workflow, then the following should be added
+# profiles:
+#   - record
+services: {}

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml

@@ -5,7 +5,7 @@ services:
       service: build.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - test
+      - ${WORKFLOW_NAME}
   build.configure:
     depends_on:
       build.init:
@@ -15,4 +15,4 @@ services:
       service: build.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - test
+      - ${WORKFLOW_NAME}

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

@@ -0,0 +1,7 @@
+# Define services here
+#
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'test' workflow, then the following should be added
+# profiles:
+#   - test
+services: {}

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml

@@ -1,20 +1,19 @@
-networks: {}
 services:
   entrypoint.configure_base:
     command:
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
     - bin/configure
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
     - bin/init
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
+    volumes:
+    - ${APP_DIR}:/app
+    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}

{stoobly_agent-1.6.6 → stoobly_agent-1.7.0}/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml

@@ -1,25 +1,19 @@
-networks:
-  entrypoint:
-    name: entrypoint
 services:
   entrypoint.configure:
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
+      - ${WORKFLOW_NAME}
     volumes: []
   entrypoint.init:
-    environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
     image: stoobly.${USER_ID}
     profiles:
-      - mock
-volumes: {}
+      - ${WORKFLOW_NAME}

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

@@ -0,0 +1,11 @@
+# Define services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add one of the scaffolded networks to the 'networks' property
+# See https://docs.stoobly.com/core-concepts/scaffold
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
+# profiles:
+#   - mock
+services: {}