3 Commits

Author SHA1 Message Date
gitea-actions
18589823f3 chore: bump version to v0.1.26
All checks were successful
Auto Tag Develop / tag (push) Successful in 5s
Build & Push Docker Image / build (push) Successful in 35s
2026-04-08 09:28:03 +00:00
Matthieu
ab2b3fd9ef feat : display container port mappings in environment health
Some checks failed
Auto Tag Develop / tag (push) Has been cancelled
Extract exposed ports from docker inspect and show them as badges (hostPort:containerPort)
in the environment health section.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-08 11:27:46 +02:00
Matthieu
123d9b306f fix : resolve Docker port conflicts and fix var/ permissions on install
Port PG 5436→5437, port frontend 3003→3005 to avoid conflicts with Coltura.
Add fix-permissions target in Makefile to create var/cache and var/log as root before composer install.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-08 11:27:37 +02:00
11 changed files with 63 additions and 11 deletions

View File

@@ -1,2 +1,2 @@
parameters:
app.version: '0.1.25'
app.version: '0.1.26'

View File

@@ -32,7 +32,7 @@ services:
depends_on:
- db
ports:
- "3003:3003"
- "3005:3003"
restart: unless-stopped
nginx:
image: nginx:1.27-alpine
@@ -47,7 +47,7 @@ services:
restart: unless-stopped
db:
image: postgres:16-alpine
command: -p ${POSTGRES_PORT:-5436}
command: -p ${POSTGRES_PORT:-5437}
environment:
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
@@ -55,7 +55,7 @@ services:
volumes:
- pg_data:/var/lib/postgresql/data
ports:
- "${POSTGRES_PORT:-5436}:${POSTGRES_PORT:-5436}"
- "${POSTGRES_PORT:-5437}:${POSTGRES_PORT:-5437}"
restart: unless-stopped
volumes:
pg_data:

View File

@@ -138,6 +138,7 @@
"uptime": "Uptime",
"cpu": "CPU",
"memory": "Memoire",
"ports": "Ports",
"noData": "Aucune donnee disponible"
},
"deploy": {

View File

@@ -427,7 +427,7 @@ onMounted(loadApplication)
<!-- Health metrics -->
<div v-if="healthByEnvId[env.id!]" class="mt-4 border-t border-neutral-200 py-3">
<p class="text-sm font-bold uppercase tracking-wider mb-2">{{ t('environments.health.title') }}</p>
<div class="grid grid-cols-2 sm:grid-cols-5 gap-3">
<div class="grid grid-cols-2 sm:grid-cols-6 gap-3">
<div>
<p class="text-xs text-neutral-400">{{ t('environments.health.status') }}</p>
<span
@@ -456,6 +456,19 @@ onMounted(loadApplication)
<span class="text-neutral-400">({{ healthByEnvId[env.id!].memoryPercent }}%)</span>
</p>
</div>
<div>
<p class="text-xs text-neutral-400">{{ t('environments.health.ports') }}</p>
<div v-if="healthByEnvId[env.id!].ports?.length" class="mt-1 flex flex-wrap gap-1">
<span
v-for="(p, i) in healthByEnvId[env.id!].ports"
:key="i"
class="inline-block rounded bg-neutral-100 px-2 py-0.5 text-xs font-mono text-neutral-700"
>
{{ p.hostPort }}:{{ p.containerPort }}
</span>
</div>
<p v-else class="text-sm text-neutral-400 mt-1">-</p>
</div>
</div>
</div>
<div class="flex justify-center gap-4 mt-4">

View File

@@ -16,6 +16,12 @@ type DashboardResponse = {
applications: DashboardApplication[]
}
type PortMapping = {
hostPort: string
containerPort: string
protocol: string
}
type EnvironmentHealth = {
status: string
version: string
@@ -24,4 +30,5 @@ type EnvironmentHealth = {
memoryUsage: string
memoryLimit: string
memoryPercent: number
ports: PortMapping[]
}

View File

@@ -5,6 +5,6 @@ APP_USER=www-data
POSTGRES_DB=central
POSTGRES_USER=root
POSTGRES_PASSWORD=root
POSTGRES_PORT=5436
POSTGRES_PORT=5437
XDEBUG_CLIENT_HOST=host.docker.internal
HOST_APPS_PATH=/home/user/workspace

View File

@@ -81,7 +81,7 @@ RUN mkdir -p /var/www/.composer/cache/vcs \
ENV COMPOSER_HOME=/var/www/.composer
# Création de la structure du projet
RUN mkdir /var/www/html/LOG
RUN mkdir -p /var/www/html/LOG /var/www/html/var/cache /var/www/html/var/log
###> User ###
ARG CURRENT_UID

View File

@@ -43,7 +43,11 @@ install: composer-install cache-clear node-use build-nuxtJS migration-migrate
# Supprime tout est réinstalle tout (Attention ça supprime la bdd aussi)
reset: delete_built_dir remove_orphans build-without-cache start wait install
composer-install:
fix-permissions:
$(EXEC_PHP_ROOT) mkdir -p var/cache var/log
$(EXEC_PHP_ROOT) chown -R $(APP_USER):$(APP_USER) var/
composer-install: fix-permissions
$(EXEC_PHP) composer install
$(SYMFONY_CONSOLE) lexik:jwt:generate-keypair --skip-if-exists

View File

@@ -26,4 +26,6 @@ final class EnvironmentHealth
public string $memoryUsage = '';
public string $memoryLimit = '';
public float $memoryPercent = 0.0;
/** @var list<array{hostPort: string, containerPort: string, protocol: string}> */
public array $ports = [];
}

View File

@@ -23,7 +23,7 @@ final class DockerService
}
/**
* @return array{status: string, image: string, version: string, startedAt: string}
* @return array{status: string, image: string, version: string, startedAt: string, ports: list<array{hostPort: string, containerPort: string, protocol: string}>}
*/
public function getContainerStatus(string $containerName): array
{
@@ -33,12 +33,13 @@ final class DockerService
'image' => '',
'version' => '',
'startedAt' => '',
'ports' => [],
];
}
$process = new Process([
'docker', 'inspect',
'--format', '{{.State.Status}}||{{.Config.Image}}||{{.State.StartedAt}}',
'--format', '{{.State.Status}}||{{.Config.Image}}||{{.State.StartedAt}}||{{json .NetworkSettings.Ports}}',
$containerName,
]);
$process->setTimeout(10);
@@ -50,10 +51,11 @@ final class DockerService
'image' => '',
'version' => '',
'startedAt' => '',
'ports' => [],
];
}
$parts = explode('||', trim($process->getOutput()));
$parts = explode('||', trim($process->getOutput()), 4);
if (\count($parts) < 3) {
return [
@@ -61,6 +63,7 @@ final class DockerService
'image' => '',
'version' => '',
'startedAt' => '',
'ports' => [],
];
}
@@ -70,11 +73,32 @@ final class DockerService
$version = substr($image, strrpos($image, ':') + 1);
}
$ports = [];
if (isset($parts[3])) {
$portsJson = json_decode($parts[3], true);
if (\is_array($portsJson)) {
foreach ($portsJson as $containerPort => $bindings) {
if (!\is_array($bindings)) {
continue;
}
[$port, $protocol] = explode('/', $containerPort) + [1 => 'tcp'];
foreach ($bindings as $binding) {
$ports[] = [
'hostPort' => $binding['HostPort'] ?? '',
'containerPort' => $port,
'protocol' => $protocol,
];
}
}
}
}
return [
'status' => $parts[0],
'image' => $image,
'version' => $version,
'startedAt' => $parts[2],
'ports' => $ports,
];
}

View File

@@ -39,6 +39,7 @@ final readonly class EnvironmentHealthProvider implements ProviderInterface
$dto->memoryUsage = $stats['memoryUsage'];
$dto->memoryLimit = $stats['memoryLimit'];
$dto->memoryPercent = $stats['memoryPercent'];
$dto->ports = $status['ports'];
return $dto;
}