diff --git a/template/{{ part_dir }}/.env.example.jinja b/template/{{ part_dir }}/.env.example.jinja index fbebbc6..f70d6fd 100644 --- a/template/{{ part_dir }}/.env.example.jinja +++ b/template/{{ part_dir }}/.env.example.jinja @@ -1,2 +1,4 @@ -{% if layout == 'root' %}COMPOSE_FILE=docker-compose.yml:docker-compose.local.yml +{% if layout == 'root' %}COMPOSE_PROFILES=services + {% endif %}PUBLIC_API_BASE_URL=/api +ALLOWED_HOSTS= diff --git a/template/{{ part_dir }}/Makefile.jinja b/template/{{ part_dir }}/Makefile.jinja index b245007..d06952b 100644 --- a/template/{{ part_dir }}/Makefile.jinja +++ b/template/{{ part_dir }}/Makefile.jinja @@ -1,8 +1,6 @@ COMPOSE := docker compose{% if layout == 'part' %} --project-directory ..{% endif %} -{% if layout == 'root' %}SERVICES := $(COMPOSE) --profile services -EXTERNAL := $(COMPOSE) --profile external -{% endif %} -.PHONY: {% if layout == 'root' %}env external recreate rebuild restart logs down {% endif %}fmt check build dev + +.PHONY: {% if layout == 'root' %}env recreate rebuild restart logs down {% endif %}fmt check build dev fmt: bun run fix @@ -20,21 +18,20 @@ dev: {% if layout == 'root' %} env: @test -f .env || cp .env.example .env + @test -f docker-compose.override.yml || cp docker-compose.override.yml.example docker-compose.override.yml -external: - $(EXTERNAL) up -d +recreate: + $(COMPOSE) up -d --force-recreate -recreate: external - $(SERVICES) up -d --force-recreate - -rebuild: build recreate +rebuild: build + $(COMPOSE) up -d restart: - $(SERVICES) restart + $(COMPOSE) restart logs: - $(SERVICES) logs -f --tail=100 + $(COMPOSE) logs -f --tail=100 down: - $(EXTERNAL) --profile services down + $(COMPOSE) down {% endif %} \ No newline at end of file diff --git a/template/{{ part_dir }}/docker-compose.local.yml.jinja b/template/{{ part_dir }}/docker-compose.local.yml.jinja deleted file mode 100644 index 889cf2a..0000000 --- a/template/{{ part_dir }}/docker-compose.local.yml.jinja +++ /dev/null @@ -1,8 +0,0 @@ -services: -{% if serve != 'api' %} frontend: - ports: - - "127.0.0.1:3000:3000" - -{% endif %} frontend-dev: - ports: - - "127.0.0.1:3000:3000" diff --git a/template/{{ part_dir }}/docker-compose.prod.yml.jinja b/template/{{ part_dir }}/docker-compose.override.yml.example.jinja similarity index 50% rename from template/{{ part_dir }}/docker-compose.prod.yml.jinja rename to template/{{ part_dir }}/docker-compose.override.yml.example.jinja index 8f34a64..6ca03f3 100644 --- a/template/{{ part_dir }}/docker-compose.prod.yml.jinja +++ b/template/{{ part_dir }}/docker-compose.override.yml.example.jinja @@ -1,8 +1,15 @@ {%- set dash = project_slug | replace('_', '-') -%} -{% if serve != 'api' -%} services: - frontend: +{% if serve != 'api' %} frontend: networks: + default: {} + caddy: + aliases: + - {{ dash }}-frontend + +{% endif %} frontend-dev: + networks: + default: {} caddy: aliases: - {{ dash }}-frontend @@ -10,6 +17,3 @@ services: networks: caddy: external: true -{%- else -%} -services: {} -{%- endif %} diff --git a/template/{{ part_dir }}/vite.config.ts b/template/{{ part_dir }}/vite.config.ts index b636ee6..b3dca69 100644 --- a/template/{{ part_dir }}/vite.config.ts +++ b/template/{{ part_dir }}/vite.config.ts @@ -2,9 +2,14 @@ import { sveltekit } from "@sveltejs/kit/vite"; import tailwindcss from "@tailwindcss/vite"; import { defineConfig } from "vite"; +const allowedHosts = process.env.ALLOWED_HOSTS + ? process.env.ALLOWED_HOSTS.split(",") + : undefined; + export default defineConfig({ plugins: [tailwindcss(), sveltekit()], server: { + allowedHosts, proxy: { "/api": { changeOrigin: true, diff --git a/template/{{ part_dir }}/{% if layout == 'root' %}README.md{% endif %}.jinja b/template/{{ part_dir }}/{% if layout == 'root' %}README.md{% endif %}.jinja new file mode 100644 index 0000000..01c5dd5 --- /dev/null +++ b/template/{{ part_dir }}/{% if layout == 'root' %}README.md{% endif %}.jinja @@ -0,0 +1,12 @@ +# {{ project_name }} + +Runs in Docker, locally the same way as in production. `COMPOSE_PROFILES` in `.env` selects the services that run on this machine. `docker-compose.override.yml` holds what differs between machines: published ports and the aliases on the external `caddy` network. + +```sh +make env +make recreate +``` + +`make env` creates `.env` and `docker-compose.override.yml` from their examples. `make recreate` starts the selected profiles, `make rebuild` builds the image first, `make logs`, `make restart` and `make down` do what they say. + +`make dev` runs the Vite dev server on the host, `make fmt` formats, `make check` runs svelte-check and the linter.