Compare commits
6
Commits
279fffb2ce
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74abd9c592 | ||
|
|
940a599515 | ||
|
|
e38ca1bf26 | ||
|
|
0538038deb | ||
|
|
65622715b5 | ||
|
|
6ee1f706e0 |
No files matched your search
@@ -1,22 +1,6 @@
|
||||
# infra
|
||||
|
||||
Copier template for the root of a project. With `layout: parts` it ships a `docker-compose.yml` that includes every part, a `Makefile` that drives compose and delegates `fmt`, `check` and `build` to parts, a `README.md` and an `.env.example` whose `COMPOSE_FILE` adds each part's `docker-compose.override.yml` and whose `COMPOSE_PROFILES` selects what runs on the machine. With `layout: single` a part template renders straight into the root and infra ships only `.gitignore`, `CLAUDE.md` and pre-commit hooks.
|
||||
|
||||
A part is a directory with:
|
||||
|
||||
- `docker-compose.yml` with root-relative paths and a profile per service, plus `docker-compose.override.yml.example` for what differs between machines
|
||||
- `Makefile` with `fmt`, `check` and `build` targets
|
||||
- `.env.example` appended to the root `.env` by `make env`
|
||||
- `CLAUDE.md` with the part's checking commands
|
||||
|
||||
Application services carry the `services` profile, databases and other infrastructure carry `external`.
|
||||
|
||||
The root also gets a `renovate.jsonc` that is nothing but an `extends` on the
|
||||
shared preset in `templates/renovate`. It does not subscribe the repo to
|
||||
anything on its own: the bot walks an explicit list, so a new repo still has to
|
||||
be added to `repositories` in `projects/personal/renovate/renovate-config.js`
|
||||
of `infra/komodo`, and needs the `renovate`, `wait-3d` and `deps-code` labels
|
||||
(`giteaproject <org>/<repo>` creates them).
|
||||
Copier template for the root of a project: compose that includes every part, a Makefile that delegates to parts, `.gitignore`, `CLAUDE.md`, pre-commit hooks and `renovate.jsonc`. A part is a directory with `docker-compose.yml` (profiles per service: `services` for the app, `external` for databases), `docker-compose.override.yml.example`, a Makefile with `fmt`, `check`, `build` and `.env.example`.
|
||||
|
||||
```sh
|
||||
copier copy --trust -d layout=parts -d 'parts=["backend","frontend"]' <this-repo> <dest>
|
||||
|
||||
@@ -32,6 +32,15 @@ parts:
|
||||
frontend: frontend
|
||||
default: []
|
||||
|
||||
mcp_servers:
|
||||
type: str
|
||||
multiselect: true
|
||||
help: MCP servers in .mcp.json
|
||||
choices:
|
||||
Context7 (library docs): context7
|
||||
Svelte docs: svelte
|
||||
default: []
|
||||
|
||||
init_git:
|
||||
type: bool
|
||||
help: git init and install pre-commit hooks
|
||||
|
||||
@@ -13,4 +13,6 @@ sessions/*.session*
|
||||
node_modules/
|
||||
.svelte-kit/
|
||||
/build/
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
# Local playground
|
||||
/t/
|
||||
@@ -1,10 +1,19 @@
|
||||
PARTS := $(patsubst %/Makefile,%,$(wildcard */Makefile))
|
||||
|
||||
.PHONY: env recreate rebuild restart logs down deploy fmt check build pre-deploy post-deploy
|
||||
.PHONY: env recreate rebuild restart logs down fmt check build
|
||||
|
||||
env:
|
||||
@test -f .env || awk 'FNR == 1 && NR > 1 { print "" } 1' .env.example $(addsuffix /.env.example,$(PARTS)) > .env
|
||||
@for part in $(PARTS); do test -f $$part/docker-compose.override.yml || cp $$part/docker-compose.override.yml.example $$part/docker-compose.override.yml; done
|
||||
@fresh=; test -f .env || { awk 'FNR == 1 && NR > 1 { print "" } 1' .env.example $(addsuffix /.env.example,$(PARTS)) > .env; fresh=1; }; \
|
||||
for part in $(PARTS); do \
|
||||
override=$$part/docker-compose.override.yml; \
|
||||
test -f $$override && continue; \
|
||||
cp $$override.example $$override; \
|
||||
for port in $$(sed -n 's/.*127\.0\.0\.1:\([0-9]*\):.*/\1/p' $$override | sort -u); do \
|
||||
random=$$((20000 + $$(od -An -N2 -tu2 /dev/urandom) % 40000)); \
|
||||
sed "s/127\.0\.0\.1:$$port:/127.0.0.1:$$random:/" $$override > $$override.tmp && mv $$override.tmp $$override; \
|
||||
test -z "$$fresh" || { sed "s|localhost:$$port/|localhost:$$random/|" .env > .env.tmp && mv .env.tmp .env; }; \
|
||||
done; \
|
||||
done
|
||||
|
||||
recreate:
|
||||
docker compose up -d --force-recreate
|
||||
@@ -21,9 +30,5 @@ logs:
|
||||
down:
|
||||
docker compose down
|
||||
|
||||
deploy: pre-deploy
|
||||
docker compose up -d
|
||||
$(MAKE) post-deploy
|
||||
|
||||
fmt check build pre-deploy post-deploy:
|
||||
fmt check build:
|
||||
@for part in $(PARTS); do $(MAKE) -C $$part $@ || exit 1; done
|
||||
@@ -2,15 +2,10 @@
|
||||
{% if project_description and project_description != project_name %}
|
||||
{{ project_description }}
|
||||
{% endif %}
|
||||
Runs in Docker, locally the same way as in production. Each part in `{{ parts | join('/`, `') }}/` brings its own `docker-compose.yml`, included from the root one. `COMPOSE_PROFILES` in `.env` selects the services that run on this machine. `docker-compose.override.yml` in each part holds what differs between machines: published ports and the aliases on the external `caddy` network.
|
||||
|
||||
```sh
|
||||
make env
|
||||
make recreate
|
||||
make env # .env and docker-compose.override.yml from the examples
|
||||
make recreate # the services in COMPOSE_PROFILES
|
||||
make check
|
||||
```
|
||||
|
||||
`make env` creates `.env` from the examples of every part and copies each `docker-compose.override.yml.example`. `make recreate` starts the selected profiles, `make rebuild` builds the images first, `make logs`, `make restart` and `make down` do what they say.
|
||||
|
||||
To deploy, `git pull && make deploy`. It runs `make pre-deploy` in every part, which builds images only when their inputs changed and applies migrations, then `docker compose up -d`, then `make post-deploy`, which restarts the services whose mounted code changed. A deploy system with its own `up` step calls the two hooks around it. What was built and started is remembered as `refs/deploy/*` in the clone.
|
||||
|
||||
`make fmt`, `make check` and `make build` run in every part. Part-specific targets live in the part's own Makefile: `make -C {{ parts[0] }} ...`.
|
||||
Parts: `{{ parts | join('/`, `') }}/`, each with its own Makefile.
|
||||
@@ -0,0 +1,11 @@
|
||||
{%- set urls = {'context7': 'https://mcp.context7.com/mcp', 'svelte': 'https://mcp.svelte.dev/mcp'} -%}
|
||||
{
|
||||
"mcpServers": {
|
||||
{%- for server in mcp_servers %}
|
||||
"{{ server }}": {
|
||||
"type": "http",
|
||||
"url": "{{ urls[server] }}"
|
||||
}{{ "," if not loop.last }}
|
||||
{%- endfor %}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user