- Clone specific commit SHA from webhook instead of just branch HEAD - Log webhook payload in deployment logs - Add build/deploy timing to ntfy and Slack notifications - Implement container rollback on deploy failure - Remove old container only after successful deployment - Show relative times in deployment history (hover for full date) - Update port mappings UI with labeled text inputs - Add footer with version info, license, and repo link - Format deploy key comment as upaas_DATE_appname
500 lines
22 KiB
HTML
500 lines
22 KiB
HTML
{{template "base" .}}
|
|
|
|
{{define "title"}}{{.App.Name}} - µPaaS{{end}}
|
|
|
|
{{define "content"}}
|
|
{{template "nav" .}}
|
|
|
|
<main class="max-w-4xl mx-auto px-4 py-8">
|
|
<div class="mb-6">
|
|
<a href="/" class="text-primary-600 hover:text-primary-800 inline-flex items-center">
|
|
<svg class="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
|
|
</svg>
|
|
Back to Dashboard
|
|
</a>
|
|
</div>
|
|
|
|
{{template "alert-success" .}}
|
|
{{template "alert-error" .}}
|
|
|
|
<!-- Header -->
|
|
<div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4 mb-8">
|
|
<div>
|
|
<div class="flex items-center gap-3">
|
|
<h1 class="text-2xl font-medium text-gray-900">{{.App.Name}}</h1>
|
|
<span id="app-status" class="{{if eq .App.Status "running"}}badge-success{{else if eq .App.Status "building"}}badge-warning{{else if eq .App.Status "error"}}badge-error{{else}}badge-neutral{{end}}">{{.App.Status}}</span>
|
|
</div>
|
|
<p class="text-gray-500 font-mono text-sm mt-1">{{.App.RepoURL}}@{{.App.Branch}}</p>
|
|
</div>
|
|
<div class="flex gap-3">
|
|
<a href="/apps/{{.App.ID}}/edit" class="btn-secondary">Edit</a>
|
|
<form id="deploy-form" method="POST" action="/apps/{{.App.ID}}/deploy" class="inline">
|
|
<button id="deploy-btn" type="submit" class="btn-success" {{if or (eq .App.Status "building") (eq .App.Status "deploying")}}disabled{{end}}>
|
|
<span id="deploy-btn-text">{{if or (eq .App.Status "building") (eq .App.Status "deploying")}}Deploying...{{else}}Deploy Now{{end}}</span>
|
|
</button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Deploy Key -->
|
|
<div class="card p-6 mb-6">
|
|
<h2 class="section-title mb-4">Deploy Key</h2>
|
|
<p class="text-sm text-gray-500 mb-3">Add this SSH public key to your repository as a read-only deploy key:</p>
|
|
<div class="copy-field">
|
|
<code id="deploy-key" class="copy-field-value text-xs">{{.DeployKey}}</code>
|
|
<button
|
|
type="button"
|
|
data-copy-target="deploy-key"
|
|
class="copy-btn"
|
|
title="Copy to clipboard"
|
|
>
|
|
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"/>
|
|
</svg>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Webhook URL -->
|
|
<div class="card p-6 mb-6">
|
|
<h2 class="section-title mb-4">Webhook URL</h2>
|
|
<p class="text-sm text-gray-500 mb-3">Add this URL as a push webhook in your Gitea repository:</p>
|
|
<div class="copy-field">
|
|
<code id="webhook-url" class="copy-field-value text-xs">{{.WebhookURL}}</code>
|
|
<button
|
|
type="button"
|
|
data-copy-target="webhook-url"
|
|
class="copy-btn"
|
|
title="Copy to clipboard"
|
|
>
|
|
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"/>
|
|
</svg>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Environment Variables -->
|
|
<div class="card p-6 mb-6">
|
|
<h2 class="section-title mb-4">Environment Variables</h2>
|
|
{{if .EnvVars}}
|
|
<div class="overflow-x-auto mb-4">
|
|
<table class="table">
|
|
<thead class="table-header">
|
|
<tr>
|
|
<th>Key</th>
|
|
<th>Value</th>
|
|
<th class="text-right">Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="table-body">
|
|
{{range .EnvVars}}
|
|
<tr>
|
|
<td class="font-mono font-medium">{{.Key}}</td>
|
|
<td class="font-mono text-gray-500">{{.Value}}</td>
|
|
<td class="text-right">
|
|
<form method="POST" action="/apps/{{$.App.ID}}/env/{{.ID}}/delete" class="inline" data-confirm="Delete this environment variable?">
|
|
<button type="submit" class="text-error-500 hover:text-error-700 text-sm">Delete</button>
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{end}}
|
|
<form method="POST" action="/apps/{{.App.ID}}/env" class="flex flex-col sm:flex-row gap-2">
|
|
<input type="text" name="key" placeholder="KEY" required class="input flex-1 font-mono text-sm">
|
|
<input type="text" name="value" placeholder="value" required class="input flex-1 font-mono text-sm">
|
|
<button type="submit" class="btn-primary">Add</button>
|
|
</form>
|
|
</div>
|
|
|
|
<!-- Labels -->
|
|
<div class="card p-6 mb-6">
|
|
<h2 class="section-title mb-4">Docker Labels</h2>
|
|
<div class="overflow-x-auto mb-4">
|
|
<table class="table">
|
|
<thead class="table-header">
|
|
<tr>
|
|
<th>Key</th>
|
|
<th>Value</th>
|
|
<th class="text-right">Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="table-body">
|
|
<!-- System-managed upaas.id label -->
|
|
<tr class="bg-gray-50">
|
|
<td class="font-mono font-medium text-gray-600">upaas.id</td>
|
|
<td class="font-mono text-gray-500">{{.App.ID}}</td>
|
|
<td class="text-right">
|
|
<span class="text-xs text-gray-400">System</span>
|
|
</td>
|
|
</tr>
|
|
{{range .Labels}}
|
|
<tr>
|
|
<td class="font-mono font-medium">{{.Key}}</td>
|
|
<td class="font-mono text-gray-500">{{.Value}}</td>
|
|
<td class="text-right">
|
|
<form method="POST" action="/apps/{{$.App.ID}}/labels/{{.ID}}/delete" class="inline" data-confirm="Delete this label?">
|
|
<button type="submit" class="text-error-500 hover:text-error-700 text-sm">Delete</button>
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
<form method="POST" action="/apps/{{.App.ID}}/labels" class="flex flex-col sm:flex-row gap-2">
|
|
<input type="text" name="key" placeholder="label.key" required class="input flex-1 font-mono text-sm">
|
|
<input type="text" name="value" placeholder="value" required class="input flex-1 font-mono text-sm">
|
|
<button type="submit" class="btn-primary">Add</button>
|
|
</form>
|
|
</div>
|
|
|
|
<!-- Volumes -->
|
|
<div class="card p-6 mb-6">
|
|
<h2 class="section-title mb-4">Volume Mounts</h2>
|
|
{{if .Volumes}}
|
|
<div class="overflow-x-auto mb-4">
|
|
<table class="table">
|
|
<thead class="table-header">
|
|
<tr>
|
|
<th>Host Path</th>
|
|
<th>Container Path</th>
|
|
<th>Mode</th>
|
|
<th class="text-right">Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="table-body">
|
|
{{range .Volumes}}
|
|
<tr>
|
|
<td class="font-mono">{{.HostPath}}</td>
|
|
<td class="font-mono">{{.ContainerPath}}</td>
|
|
<td>
|
|
{{if .ReadOnly}}
|
|
<span class="badge-neutral">Read-only</span>
|
|
{{else}}
|
|
<span class="badge-info">Read-write</span>
|
|
{{end}}
|
|
</td>
|
|
<td class="text-right">
|
|
<form method="POST" action="/apps/{{$.App.ID}}/volumes/{{.ID}}/delete" class="inline" data-confirm="Delete this volume mount?">
|
|
<button type="submit" class="text-error-500 hover:text-error-700 text-sm">Delete</button>
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{end}}
|
|
<form method="POST" action="/apps/{{.App.ID}}/volumes" class="flex flex-col sm:flex-row gap-2 items-end">
|
|
<div class="flex-1 w-full">
|
|
<input type="text" name="host_path" placeholder="/host/path" required class="input font-mono text-sm">
|
|
</div>
|
|
<div class="flex-1 w-full">
|
|
<input type="text" name="container_path" placeholder="/container/path" required class="input font-mono text-sm">
|
|
</div>
|
|
<label class="flex items-center gap-2 text-sm text-gray-600 whitespace-nowrap">
|
|
<input type="checkbox" name="readonly" value="1" class="rounded border-gray-300 text-primary-600 focus:ring-primary-500">
|
|
Read-only
|
|
</label>
|
|
<button type="submit" class="btn-primary">Add</button>
|
|
</form>
|
|
</div>
|
|
|
|
<!-- Ports -->
|
|
<div class="card p-6 mb-6">
|
|
<h2 class="section-title mb-4">Port Mappings</h2>
|
|
{{if .Ports}}
|
|
<div class="overflow-x-auto mb-4">
|
|
<table class="table">
|
|
<thead class="table-header">
|
|
<tr>
|
|
<th>Host Port</th>
|
|
<th>Container Port</th>
|
|
<th>Protocol</th>
|
|
<th class="text-right">Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="table-body">
|
|
{{range .Ports}}
|
|
<tr>
|
|
<td class="font-mono">{{.HostPort}}</td>
|
|
<td class="font-mono">{{.ContainerPort}}</td>
|
|
<td>
|
|
{{if eq .Protocol "udp"}}
|
|
<span class="badge-warning">UDP</span>
|
|
{{else}}
|
|
<span class="badge-info">TCP</span>
|
|
{{end}}
|
|
</td>
|
|
<td class="text-right">
|
|
<form method="POST" action="/apps/{{$.App.ID}}/ports/{{.ID}}/delete" class="inline" data-confirm="Delete this port mapping?">
|
|
<button type="submit" class="text-error-500 hover:text-error-700 text-sm">Delete</button>
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{end}}
|
|
<form method="POST" action="/apps/{{.App.ID}}/ports" class="flex flex-col sm:flex-row gap-2 items-end">
|
|
<div class="flex-1 w-full">
|
|
<label class="block text-xs text-gray-500 mb-1">Host (external)</label>
|
|
<input type="text" name="host_port" placeholder="8080" required pattern="[0-9]+" class="input font-mono text-sm">
|
|
</div>
|
|
<div class="flex-1 w-full">
|
|
<label class="block text-xs text-gray-500 mb-1">Container (internal)</label>
|
|
<input type="text" name="container_port" placeholder="80" required pattern="[0-9]+" class="input font-mono text-sm">
|
|
</div>
|
|
<div>
|
|
<label class="block text-xs text-gray-500 mb-1">Protocol</label>
|
|
<select name="protocol" class="input text-sm">
|
|
<option value="tcp">TCP</option>
|
|
<option value="udp">UDP</option>
|
|
</select>
|
|
</div>
|
|
<button type="submit" class="btn-primary">Add</button>
|
|
</form>
|
|
</div>
|
|
|
|
<!-- Container Logs -->
|
|
<div class="card p-6 mb-6">
|
|
<div class="flex items-center justify-between mb-4">
|
|
<h2 class="section-title">Container Logs</h2>
|
|
<span id="container-status" class="badge-neutral text-xs">Loading...</span>
|
|
</div>
|
|
<div id="container-logs-wrapper" class="bg-gray-900 rounded-lg p-4 overflow-auto" style="max-height: 400px;">
|
|
<pre id="container-logs" class="text-gray-100 text-xs font-mono whitespace-pre-wrap">Loading container logs...</pre>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Recent Deployments -->
|
|
<div class="card p-6 mb-6">
|
|
<div class="flex items-center justify-between mb-4">
|
|
<h2 class="section-title">Recent Deployments</h2>
|
|
<a href="/apps/{{.App.ID}}/deployments" class="text-primary-600 hover:text-primary-800 text-sm">View All</a>
|
|
</div>
|
|
{{if .Deployments}}
|
|
<div class="overflow-x-auto">
|
|
<table class="table">
|
|
<thead class="table-header">
|
|
<tr>
|
|
<th>Finished</th>
|
|
<th>Duration</th>
|
|
<th>Status</th>
|
|
<th>Commit</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="table-body">
|
|
{{range .Deployments}}
|
|
<tr>
|
|
<td class="text-gray-500">
|
|
<span class="relative-time" data-time="{{.FinishedAtISO}}" title="{{.FinishedAtFormatted}}">{{.FinishedAtFormatted}}</span>
|
|
</td>
|
|
<td class="text-gray-500">{{if .Duration}}{{.Duration}}{{else}}-{{end}}</td>
|
|
<td>
|
|
{{if eq .Status "success"}}
|
|
<span class="badge-success">Success</span>
|
|
{{else if eq .Status "failed"}}
|
|
<span class="badge-error">Failed</span>
|
|
{{else if eq .Status "building"}}
|
|
<span class="badge-warning">Building</span>
|
|
{{else if eq .Status "deploying"}}
|
|
<span class="badge-info">Deploying</span>
|
|
{{else}}
|
|
<span class="badge-neutral">{{.Status}}</span>
|
|
{{end}}
|
|
</td>
|
|
<td class="font-mono text-gray-500 text-xs">{{.ShortCommit}}</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{else}}
|
|
<p class="text-gray-500 text-sm">No deployments yet.</p>
|
|
{{end}}
|
|
</div>
|
|
|
|
<!-- Last Deployment Build Logs -->
|
|
<div id="build-logs-section" class="card p-6 mb-6" {{if not .LatestDeployment}}style="display: none;"{{end}}>
|
|
<div class="flex items-center justify-between mb-4">
|
|
<h2 class="section-title">Last Deployment Build Logs</h2>
|
|
<span id="build-status" class="badge-neutral text-xs">{{if .LatestDeployment}}{{.LatestDeployment.Status}}{{end}}</span>
|
|
</div>
|
|
<div id="build-logs-wrapper" class="bg-gray-900 rounded-lg p-4 overflow-auto" style="max-height: 400px;">
|
|
<pre id="build-logs" class="text-gray-100 text-xs font-mono whitespace-pre-wrap">{{if .LatestDeployment}}Loading build logs...{{else}}No deployments yet{{end}}</pre>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Danger Zone -->
|
|
<div class="card border-2 border-error-500/20 bg-error-50/50 p-6">
|
|
<h2 class="text-lg font-medium text-error-700 mb-4">Danger Zone</h2>
|
|
<p class="text-error-600 text-sm mb-4">Deleting this app will remove all configuration and deployment history. This action cannot be undone.</p>
|
|
<form method="POST" action="/apps/{{.App.ID}}/delete" data-confirm="Are you sure you want to delete this app? This action cannot be undone.">
|
|
<button type="submit" class="btn-danger">Delete App</button>
|
|
</form>
|
|
</div>
|
|
</main>
|
|
|
|
<script>
|
|
(function() {
|
|
// Relative time formatting
|
|
function formatRelativeTime(dateStr) {
|
|
const date = new Date(dateStr);
|
|
const now = new Date();
|
|
const diffMs = now - date;
|
|
const diffSec = Math.floor(diffMs / 1000);
|
|
const diffMin = Math.floor(diffSec / 60);
|
|
const diffHour = Math.floor(diffMin / 60);
|
|
const diffDay = Math.floor(diffHour / 24);
|
|
|
|
if (diffSec < 60) return 'just now';
|
|
if (diffMin < 60) return diffMin + (diffMin === 1 ? ' minute ago' : ' minutes ago');
|
|
if (diffHour < 24) return diffHour + (diffHour === 1 ? ' hour ago' : ' hours ago');
|
|
if (diffDay < 7) return diffDay + (diffDay === 1 ? ' day ago' : ' days ago');
|
|
return date.toLocaleDateString();
|
|
}
|
|
|
|
function updateRelativeTimes() {
|
|
document.querySelectorAll('.relative-time').forEach(el => {
|
|
const time = el.getAttribute('data-time');
|
|
if (time) {
|
|
el.textContent = formatRelativeTime(time);
|
|
}
|
|
});
|
|
}
|
|
|
|
// Update relative times on load and every minute
|
|
updateRelativeTimes();
|
|
setInterval(updateRelativeTimes, 60000);
|
|
|
|
const appId = "{{.App.ID}}";
|
|
const containerLogsEl = document.getElementById('container-logs');
|
|
const containerLogsWrapper = document.getElementById('container-logs-wrapper');
|
|
const containerStatusEl = document.getElementById('container-status');
|
|
const buildLogsEl = document.getElementById('build-logs');
|
|
const buildLogsWrapper = document.getElementById('build-logs-wrapper');
|
|
const buildStatusEl = document.getElementById('build-status');
|
|
const buildLogsSection = document.getElementById('build-logs-section');
|
|
const appStatusEl = document.getElementById('app-status');
|
|
const deployBtn = document.getElementById('deploy-btn');
|
|
const deployBtnText = document.getElementById('deploy-btn-text');
|
|
|
|
let currentDeploymentId = {{if .LatestDeployment}}{{.LatestDeployment.ID}}{{else}}null{{end}};
|
|
|
|
function updateAppStatusBadge(status) {
|
|
appStatusEl.className = '';
|
|
if (status === 'running') {
|
|
appStatusEl.className = 'badge-success';
|
|
} else if (status === 'building' || status === 'deploying') {
|
|
appStatusEl.className = 'badge-warning';
|
|
} else if (status === 'error') {
|
|
appStatusEl.className = 'badge-error';
|
|
} else {
|
|
appStatusEl.className = 'badge-neutral';
|
|
}
|
|
appStatusEl.textContent = status.charAt(0).toUpperCase() + status.slice(1);
|
|
}
|
|
|
|
function updateDeployButton(status) {
|
|
const isDeploying = (status === 'building' || status === 'deploying');
|
|
deployBtn.disabled = isDeploying;
|
|
deployBtnText.textContent = isDeploying ? 'Deploying...' : 'Deploy Now';
|
|
if (isDeploying) {
|
|
deployBtn.classList.add('opacity-50', 'cursor-not-allowed');
|
|
} else {
|
|
deployBtn.classList.remove('opacity-50', 'cursor-not-allowed');
|
|
}
|
|
}
|
|
|
|
function updateStatusBadge(el, status) {
|
|
if (!el) return;
|
|
el.className = '';
|
|
if (status === 'running' || status === 'success') {
|
|
el.className = 'badge-success text-xs';
|
|
} else if (status === 'building' || status === 'deploying') {
|
|
el.className = 'badge-warning text-xs';
|
|
} else if (status === 'failed' || status === 'error') {
|
|
el.className = 'badge-error text-xs';
|
|
} else {
|
|
el.className = 'badge-neutral text-xs';
|
|
}
|
|
el.textContent = status.charAt(0).toUpperCase() + status.slice(1);
|
|
}
|
|
|
|
function scrollToBottom(el) {
|
|
if (el) {
|
|
el.scrollTop = el.scrollHeight;
|
|
}
|
|
}
|
|
|
|
function fetchAppStatus() {
|
|
fetch('/apps/' + appId + '/status')
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
updateAppStatusBadge(data.status);
|
|
updateDeployButton(data.status);
|
|
|
|
// Check if there's a new deployment
|
|
if (data.latestDeploymentID && data.latestDeploymentID !== currentDeploymentId) {
|
|
currentDeploymentId = data.latestDeploymentID;
|
|
// Show build logs section if hidden
|
|
if (buildLogsSection) {
|
|
buildLogsSection.style.display = '';
|
|
}
|
|
// Immediately fetch new build logs
|
|
fetchBuildLogs();
|
|
}
|
|
})
|
|
.catch(err => {
|
|
console.error('Failed to fetch app status:', err);
|
|
});
|
|
}
|
|
|
|
function fetchContainerLogs() {
|
|
fetch('/apps/' + appId + '/container-logs')
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
containerLogsEl.textContent = data.logs || 'No logs available';
|
|
updateStatusBadge(containerStatusEl, data.status);
|
|
scrollToBottom(containerLogsWrapper);
|
|
})
|
|
.catch(err => {
|
|
containerLogsEl.textContent = 'Failed to fetch logs: ' + err.message;
|
|
});
|
|
}
|
|
|
|
function fetchBuildLogs() {
|
|
if (!currentDeploymentId || !buildLogsEl) return;
|
|
|
|
fetch('/apps/' + appId + '/deployments/' + currentDeploymentId + '/logs')
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
buildLogsEl.textContent = data.logs || 'No build logs available';
|
|
updateStatusBadge(buildStatusEl, data.status);
|
|
scrollToBottom(buildLogsWrapper);
|
|
})
|
|
.catch(err => {
|
|
buildLogsEl.textContent = 'Failed to fetch logs: ' + err.message;
|
|
});
|
|
}
|
|
|
|
// Initial fetch
|
|
fetchAppStatus();
|
|
fetchContainerLogs();
|
|
fetchBuildLogs();
|
|
|
|
// Refresh every second
|
|
setInterval(fetchAppStatus, 1000);
|
|
setInterval(fetchContainerLogs, 1000);
|
|
setInterval(fetchBuildLogs, 1000);
|
|
})();
|
|
</script>
|
|
{{end}}
|