fix(compose): keep service names as hostnames in preview deployments

A preview renames its services to <name>-pr-<id>, so services that call
each other by their Compose names failed to start. Add the original name as an alias on the preview network.

Closes #8030

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Andras Bacsai
2026-11-03 22:02:23 +01:00
co-authored by Claude Opus 5.5
parent 780d67ccbb
commit 3c87879e6b
6 changed files with 258 additions and 65 deletions
+3 -1
View File
@@ -1784,8 +1784,10 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
$networks_temp->put($key, $network);
}
}
// A preview renames its services to "<name>-pr-<id>". The alias keeps the original name as a hostname
// on the preview network, so that services can still reach each other by their Compose names.
foreach ($baseNetwork as $key => $network) {
$networks_temp->put($network, null);
$networks_temp->put($network, $isPullRequest ? ['aliases' => [(string) $serviceName]] : null);
}
if (data_get($resource, 'settings.connect_to_docker_network')) {
@@ -0,0 +1,63 @@
<?php
use App\Models\Application;
use App\Models\ApplicationPreview;
use App\Models\Environment;
use App\Models\Project;
use App\Models\Server;
use App\Models\StandaloneDocker;
use App\Models\Team;
use Illuminate\Foundation\Testing\RefreshDatabase;
uses(RefreshDatabase::class);
beforeEach(function () {
Server::flushIdentityMap();
$team = Team::factory()->create();
$server = Server::factory()->create(['team_id' => $team->id]);
$destination = StandaloneDocker::query()->where('server_id', $server->id)->first()
?? StandaloneDocker::factory()->create(['server_id' => $server->id]);
$project = Project::factory()->create(['team_id' => $team->id]);
$environment = Environment::factory()->create(['project_id' => $project->id]);
$this->application = Application::factory()->create([
'build_pack' => 'dockercompose',
'environment_id' => $environment->id,
'destination_id' => $destination->id,
'destination_type' => $destination->getMorphClass(),
'docker_compose_raw' => <<<'YAML'
services:
search:
image: getmeili/meilisearch:v1.11.3
web:
image: nginx:alpine
environment:
MEILI_URL: http://search:7700
depends_on:
search:
condition: service_healthy
YAML,
]);
});
it('keeps the compose service name as a hostname on the preview network', function () {
$preview = ApplicationPreview::create([
'application_id' => $this->application->id,
'pull_request_id' => 685,
'pull_request_html_url' => 'https://github.com/example/repository/pull/685',
]);
$services = $this->application->fresh()->parse(pull_request_id: 685, preview_id: $preview->id)->toArray()['services'];
$previewNetwork = "{$this->application->uuid}-685";
expect(array_keys($services))->toBe(['search-pr-685', 'web-pr-685'])
->and($services['search-pr-685']['networks'])->toBe([$previewNetwork => ['aliases' => ['search']]])
->and($services['web-pr-685']['networks'])->toBe([$previewNetwork => ['aliases' => ['web']]]);
});
it('adds no alias to the network of a production deployment', function () {
$services = $this->application->fresh()->parse()->toArray()['services'];
expect($services['search']['networks'])->toBe([$this->application->uuid => null]);
});
@@ -1512,7 +1512,9 @@
container_name: web-referenceapplication0001-pr-7
restart: unless-stopped
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- web
env_file:
- .env
image: 'referenceapplication0001_web:pr-7'
@@ -1585,7 +1587,9 @@
- 'caddy_0=https://7.www.api.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api
env_file:
- .env
my-app-pr-7:
@@ -1644,7 +1648,9 @@
- 'caddy_0=https://7.my-app.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- my-app
env_file:
- .env
api.v2-pr-7:
@@ -1671,7 +1677,9 @@
- 'caddy_0=https://7.api-v2.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api.v2
environment:
COOLIFY_BRANCH: '"pull/7/head"'
COOLIFY_RESOURCE_UUID: referenceapplication0001
@@ -1741,7 +1749,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- admin
container_name: admin-referenceapplication0001-pr-7
restart: unless-stopped
labels:
@@ -1821,7 +1831,9 @@
- 'caddy_0=https://7.blog.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- blog
env_file:
- .env
db-pr-7:
@@ -1862,7 +1874,9 @@
- 'referenceapplication0001_db-data-pr-7:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- db
healthcheck:
test:
- CMD-SHELL
@@ -1985,7 +1999,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- worker
env_file:
- .env
volumes:
@@ -2191,7 +2207,9 @@
container_name: web-referenceapplication0001-pr-8
restart: unless-stopped
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- web
env_file:
- .env
image: 'referenceapplication0001_web:pr-8'
@@ -2242,7 +2260,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api
env_file:
- .env
my-app-pr-8:
@@ -2279,7 +2299,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- my-app
env_file:
- .env
api.v2-pr-8:
@@ -2298,7 +2320,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api.v2
environment:
COOLIFY_BRANCH: '"pull/8/head"'
COOLIFY_RESOURCE_UUID: referenceapplication0001
@@ -2340,7 +2364,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- admin
container_name: admin-referenceapplication0001-pr-8
restart: unless-stopped
labels:
@@ -2390,7 +2416,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- blog
env_file:
- .env
db-pr-8:
@@ -2419,7 +2447,9 @@
- 'referenceapplication0001_db-data-pr-8:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- db
healthcheck:
test:
- CMD-SHELL
@@ -2518,7 +2548,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- worker
env_file:
- .env
volumes:
@@ -1587,7 +1587,9 @@
container_name: web-referenceapplication0001-pr-7
restart: unless-stopped
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- web
env_file:
- .env
image: 'referenceapplication0001_web:pr-7'
@@ -1669,7 +1671,9 @@
- traefik.http.services.http-0-referenceapplication0001-7-api-8a5d.loadbalancer.server.port=3001
- traefik.http.services.https-0-referenceapplication0001-7-api-8a5d.loadbalancer.server.port=3001
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api
env_file:
- .env
my-app-pr-7:
@@ -1737,7 +1741,9 @@
- traefik.http.services.http-0-referenceapplication0001-7-my-app-4dcb.loadbalancer.server.port=80
- traefik.http.services.https-0-referenceapplication0001-7-my-app-4dcb.loadbalancer.server.port=80
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- my-app
env_file:
- .env
api.v2-pr-7:
@@ -1769,7 +1775,9 @@
- traefik.http.routers.https-0-referenceapplication0001-7-api-v2-b0fa.tls.certresolver=letsencrypt
- traefik.http.routers.https-0-referenceapplication0001-7-api-v2-b0fa.tls=true
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api.v2
environment:
COOLIFY_BRANCH: '"pull/7/head"'
COOLIFY_RESOURCE_UUID: referenceapplication0001
@@ -1839,7 +1847,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- admin
container_name: admin-referenceapplication0001-pr-7
restart: unless-stopped
labels:
@@ -1938,7 +1948,9 @@
- traefik.http.routers.https-0-referenceapplication0001-7-blog-126a.tls.certresolver=letsencrypt
- traefik.http.routers.https-0-referenceapplication0001-7-blog-126a.tls=true
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- blog
env_file:
- .env
db-pr-7:
@@ -1979,7 +1991,9 @@
- 'referenceapplication0001_db-data-pr-7:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- db
healthcheck:
test:
- CMD-SHELL
@@ -2102,7 +2116,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- worker
env_file:
- .env
volumes:
@@ -2308,7 +2324,9 @@
container_name: web-referenceapplication0001-pr-8
restart: unless-stopped
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- web
env_file:
- .env
image: 'referenceapplication0001_web:pr-8'
@@ -2359,7 +2377,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api
env_file:
- .env
my-app-pr-8:
@@ -2396,7 +2416,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- my-app
env_file:
- .env
api.v2-pr-8:
@@ -2415,7 +2437,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api.v2
environment:
COOLIFY_BRANCH: '"pull/8/head"'
COOLIFY_RESOURCE_UUID: referenceapplication0001
@@ -2457,7 +2481,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- admin
container_name: admin-referenceapplication0001-pr-8
restart: unless-stopped
labels:
@@ -2507,7 +2533,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- blog
env_file:
- .env
db-pr-8:
@@ -2536,7 +2564,9 @@
- 'referenceapplication0001_db-data-pr-8:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- db
healthcheck:
test:
- CMD-SHELL
@@ -2635,7 +2665,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- worker
env_file:
- .env
volumes:
@@ -1789,7 +1789,9 @@
container_name: web-referenceapplication0001-pr-7
restart: unless-stopped
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- web
coolify: null
logging:
driver: fluentd
@@ -1885,7 +1887,9 @@
- 'caddy_0=https://7.www.api.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api
coolify: null
logging:
driver: fluentd
@@ -1967,7 +1971,9 @@
- 'caddy_0=https://7.my-app.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- my-app
coolify: null
logging:
driver: fluentd
@@ -2013,7 +2019,9 @@
- 'caddy_0=https://7.api-v2.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api.v2
coolify: null
environment:
COOLIFY_BRANCH: '"pull/7/head"'
@@ -2091,7 +2099,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- admin
coolify: null
container_name: admin-referenceapplication0001-pr-7
restart: unless-stopped
@@ -2210,7 +2220,9 @@
- 'caddy_0=https://7.blog.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- blog
coolify: null
logging:
driver: fluentd
@@ -2259,7 +2271,9 @@
- 'referenceapplication0001_db-data-pr-7:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- db
coolify: null
healthcheck:
test:
@@ -2397,7 +2411,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- worker
coolify: null
logging:
driver: fluentd
@@ -2614,7 +2630,9 @@
container_name: web-referenceapplication0001-pr-8
restart: unless-stopped
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- web
coolify: null
logging:
driver: fluentd
@@ -2673,7 +2691,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api
coolify: null
logging:
driver: fluentd
@@ -2718,7 +2738,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- my-app
coolify: null
logging:
driver: fluentd
@@ -2745,7 +2767,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api.v2
coolify: null
environment:
COOLIFY_BRANCH: '"pull/8/head"'
@@ -2795,7 +2819,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- admin
coolify: null
container_name: admin-referenceapplication0001-pr-8
restart: unless-stopped
@@ -2853,7 +2879,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- blog
coolify: null
logging:
driver: fluentd
@@ -2890,7 +2918,9 @@
- 'referenceapplication0001_db-data-pr-8:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- db
coolify: null
healthcheck:
test:
@@ -3004,7 +3034,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- worker
coolify: null
logging:
driver: fluentd
+48 -16
View File
@@ -1673,7 +1673,9 @@
container_name: web-referenceapplication0001-pr-7
restart: unless-stopped
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- web
env_file:
- .env
image: 'referenceapplication0001_web:pr-7'
@@ -1763,7 +1765,9 @@
- 'caddy_0=https://7.www.api.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api
env_file:
- .env
my-app-pr-7:
@@ -1839,7 +1843,9 @@
- 'caddy_0=https://7.my-app.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- my-app
env_file:
- .env
api.v2-pr-7:
@@ -1879,7 +1885,9 @@
- 'caddy_0=https://7.api-v2.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- api.v2
environment:
COOLIFY_BRANCH: '"pull/7/head"'
COOLIFY_RESOURCE_UUID: referenceapplication0001
@@ -1949,7 +1957,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- admin
container_name: admin-referenceapplication0001-pr-7
restart: unless-stopped
labels:
@@ -2064,7 +2074,9 @@
- 'caddy_0=https://7.blog.example.com'
- caddy_ingress_network=referenceapplication0001-7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- blog
env_file:
- .env
db-pr-7:
@@ -2105,7 +2117,9 @@
- 'referenceapplication0001_db-data-pr-7:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- db
healthcheck:
test:
- CMD-SHELL
@@ -2228,7 +2242,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=7
networks:
referenceapplication0001-7: null
referenceapplication0001-7:
aliases:
- worker
env_file:
- .env
volumes:
@@ -2434,7 +2450,9 @@
container_name: web-referenceapplication0001-pr-8
restart: unless-stopped
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- web
env_file:
- .env
image: 'referenceapplication0001_web:pr-8'
@@ -2485,7 +2503,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api
env_file:
- .env
my-app-pr-8:
@@ -2522,7 +2542,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- my-app
env_file:
- .env
api.v2-pr-8:
@@ -2541,7 +2563,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- api.v2
environment:
COOLIFY_BRANCH: '"pull/8/head"'
COOLIFY_RESOURCE_UUID: referenceapplication0001
@@ -2583,7 +2607,9 @@
networks:
internal:
ipv4_address: 172.30.0.10
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- admin
container_name: admin-referenceapplication0001-pr-8
restart: unless-stopped
labels:
@@ -2633,7 +2659,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- blog
env_file:
- .env
db-pr-8:
@@ -2662,7 +2690,9 @@
- 'referenceapplication0001_db-data-pr-8:/var/lib/postgresql/data'
networks:
internal: null
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- db
healthcheck:
test:
- CMD-SHELL
@@ -2761,7 +2791,9 @@
- coolify.environmentName=production
- coolify.pullRequestId=8
networks:
referenceapplication0001-8: null
referenceapplication0001-8:
aliases:
- worker
env_file:
- .env
volumes: