diff --git a/template/{{ part_dir }}/Makefile.jinja b/template/{{ part_dir }}/Makefile.jinja index 857b3ee..724896d 100644 --- a/template/{{ part_dir }}/Makefile.jinja +++ b/template/{{ part_dir }}/Makefile.jinja @@ -28,8 +28,15 @@ dev: bun run 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 + @fresh=; test -f .env || { cp .env.example .env; fresh=1; }; \ + if ! test -f docker-compose.override.yml; then \ + cp docker-compose.override.yml.example docker-compose.override.yml; \ + for port in $$(sed -n 's/.*127\.0\.0\.1:\([0-9]*\):.*/\1/p' docker-compose.override.yml | sort -u); do \ + random=$$((20000 + $$(od -An -N2 -tu2 /dev/urandom) % 40000)); \ + sed "s/127\.0\.0\.1:$$port:/127.0.0.1:$$random:/" docker-compose.override.yml > docker-compose.override.yml.tmp && mv docker-compose.override.yml.tmp docker-compose.override.yml; \ + test -z "$$fresh" || { sed "s|localhost:$$port/|localhost:$$random/|" .env > .env.tmp && mv .env.tmp .env; }; \ + done; \ + fi recreate: $(COMPOSE) up -d --force-recreate diff --git a/template/{{ part_dir }}/docker-compose.override.yml.example.jinja b/template/{{ part_dir }}/docker-compose.override.yml.example.jinja index 6ca03f3..b70762b 100644 --- a/template/{{ part_dir }}/docker-compose.override.yml.example.jinja +++ b/template/{{ part_dir }}/docker-compose.override.yml.example.jinja @@ -6,6 +6,8 @@ services: caddy: aliases: - {{ dash }}-frontend +# ports: +# - "127.0.0.1:3000:3000" {% endif %} frontend-dev: networks: @@ -13,6 +15,8 @@ services: caddy: aliases: - {{ dash }}-frontend +# ports: +# - "127.0.0.1:3000:3000" networks: caddy: