Update default Dockerfile and Services docs (#1265)

Author: droserasprout

docs/5.advanced/1.docker.md

@@ -105,6 +105,8 @@ docker-compose up -d --build
 
 ## Docker Swarm
 
+Unlike ready-to-use Compose manifest provided by DipDup, Swarm one requires some additional setup.
+
 Scaffolded projects contain a compose file for Docker Swarm. Before spawning this stack create external networks `traefik-public` and `prometheus-private`. Optionally, deploy Traefik and Prometheus and attach them to these networks to get a fully functional stack.
 
 ```yaml [deploy/compose.swarm.yaml]

docs/5.advanced/5.services.md

@@ -65,22 +65,38 @@ async def heavy_stuff(ctx, key: str) -> None:
     ):
         ...
 
+```
+
+Note that `ctx` argument is `click.Context` object, not a `dipdup.context.DipDupContext`! If you need deeper integration with DipDup, use the following code:
+
+```python[cli.py]
+from dipdup.dipdup import DipDup
+from dipdup.context import DipDupContext
+
+
+dipdup: DipDup = DipDup(ctx.obj.config)
+dipdup_ctx: DipDupContext = dipdup._ctx
+```
+
+Then create a `__main__.py` file to make the module executable:
+
+```python[__main__.py
+from {{ project.package }}.cli import cli
 
 if __name__ == '__main__':
     cli(prog_name='dipdup', standalone_mode=True)
 ```
 
-Then use `python -m {{ project.package }}.cli` instead of `dipdup` as an entrypoint. Now you can call `heavy-stuff` like one of DipDup commands. `dipdup.cli:cli` group handles arguments and config parsing, graceful shutdown, and other boilerplate.
+Then use `python -m {{ project.package }}` instead of `dipdup` as an entrypoint. Now you can call `heavy-stuff` like one of DipDup commands. `dipdup.cli:cli` group handles arguments and config parsing, graceful shutdown, and other boilerplate.
 
 ```shell [Terminal]
-python -m {{ project.package }}.cli heavy-stuff --key value
+python -m {{ project.package }} heavy-stuff --key value
 ```
 
-If your service is long-running, you need to update Dockerfile and Compose manifests. Copy `deploy/Dockerfile` to `deploy/Dockerfile.service` and add the following lines to the end of the file:
+If your new command is a long long-running service, you need to update Dockerfile and Compose manifests. Update the `deploy/Dockerfile` to use the new entrypoint:
 
 ```dockerfile [deploy/Dockerfile.service]
-ENTRYPOINT ["python", "-m", "{{ project.package }}.cli"]
-CMD ["heavy-stuff", "--key", "value"]
+ENTRYPOINT ["python", "-m", "{{ project.package }}"]
 ```
 
 For Docker Compose, add a new service to `deploy/compose.yaml`:
@@ -90,7 +106,8 @@ services:
   dipdup_service:
     build:
       context: .
-      dockerfile: deploy/Dockerfile.service
+      dockerfile: deploy/Dockerfile
+      command: ["heavy-stuff", "--key", "value"]
     ...
 ```
 

src/dipdup/projects/base/deploy/Dockerfile.j2

@@ -1,11 +1,16 @@
 {{ header }}
 
+#### Uncomment another FROM line to use a different base image
 FROM dipdup/dipdup:{{ project.dipdup_version }}
 # FROM ghcr.io/dipdup-io/dipdup:{{ project.dipdup_version }}
 # FROM ghcr.io/dipdup-io/dipdup:next
 
+#### Uncomment lines below if your project requires additional dependencies 
 # COPY --chown=dipdup pyproject.toml README.md .
 # RUN pip install .
 
+#### Uncomment if you have implemented a custom CLI command (see Services in docs)
+# ENTRYPOINT ["python", "-m", "{{ project.package }}"]
+
 COPY --chown=dipdup . {{ project.package }}
 WORKDIR /home/dipdup/{{ project.package }}