disinto-admin/disinto
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix: docker-compose.yml generated by init diverges from running stack — recreate breaks services (#354) #371

Merged
dev-bot merged 1 commit from fix/issue-354 into main 2026-04-07 18:09:03 +00:00
Conversation 4 Commits 1 Files changed 1 +8 -3
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/generators.sh
View file

@ -43,7 +43,8 @@ _generate_compose_impl() {
services: services:
forgejo: forgejo:
image: codeberg.org/forgejo/forgejo:11.0 image: codeberg.org/forgejo/forgejo:1
container_name: disinto-forgejo
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- apparmor=unconfined - apparmor=unconfined
@ -61,6 +62,7 @@ services:
woodpecker: woodpecker:
image: woodpeckerci/woodpecker-server:v3 image: woodpeckerci/woodpecker-server:v3
container_name: disinto-woodpecker
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- apparmor=unconfined - apparmor=unconfined
@ -87,6 +89,7 @@ services:
woodpecker-agent: woodpecker-agent:
image: woodpeckerci/woodpecker-agent:v3 image: woodpeckerci/woodpecker-agent:v3
container_name: disinto-woodpecker-agent
restart: unless-stopped restart: unless-stopped
network_mode: host network_mode: host
privileged: true privileged: true
@ -106,6 +109,7 @@ services:
build: build:
context: . context: .
dockerfile: docker/agents/Dockerfile dockerfile: docker/agents/Dockerfile
container_name: disinto-agents
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- apparmor=unconfined - apparmor=unconfined
@ -158,6 +162,7 @@ services:
# Serves on ports 80/443, routes based on path # Serves on ports 80/443, routes based on path
edge: edge:
build: ./docker/edge build: ./docker/edge
container_name: disinto-edge
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@ -234,9 +239,9 @@ COMPOSEEOF
# Patch the forgejo port mapping into the file if non-default # Patch the forgejo port mapping into the file if non-default
if [ "$forge_port" != "3000" ]; then if [ "$forge_port" != "3000" ]; then
# Add port mapping to forgejo service so it's reachable from host during init # Add port mapping to forgejo service so it's reachable from host during init
sed -i "/image: codeberg\.org\/forgejo\/forgejo:11\.0/a\\ ports:\\n - \"${forge_port}:3000\"" "$compose_file" sed -i "/image: codeberg\.org\/forgejo\/forgejo:1/a\\ ports:\\n - \"${forge_port}:3000\"" "$compose_file"
else else
sed -i "/image: codeberg\.org\/forgejo\/forgejo:11\.0/a\\ ports:\\n - \"3000:3000\"" "$compose_file" sed -i "/image: codeberg\.org\/forgejo\/forgejo:1/a\\ ports:\\n - \"3000:3000\"" "$compose_file"
fi fi
echo "Created: ${compose_file}" echo "Created: ${compose_file}"