forked from admin/brencher
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68af144f7a | ||
|
|
5d9cbe8df6 |
@@ -45,10 +45,10 @@ deployDocker = DockerSwarmDeploy(
|
||||
docker_compose_path="docker-compose.yml",
|
||||
)
|
||||
|
||||
#checkPing = UrlCheck(
|
||||
# url="https://brencher.rudolf.keenetic.link/state",
|
||||
# expected=checkPingF,
|
||||
#)
|
||||
checkPing = UrlCheck(
|
||||
url="https://brencher.rudolf.keenetic.link/state",
|
||||
expected=checkPingF,
|
||||
)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://brencher.rudolf.keenetic.link/",
|
||||
@@ -68,7 +68,7 @@ brencher = Environment(
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing,
|
||||
checkPing,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
|
||||
@@ -72,10 +72,10 @@ deployDocker = DockerSwarmDeploy(
|
||||
docker_compose_path="docker-compose.yml",
|
||||
)
|
||||
|
||||
#checkPing = UrlCheck(
|
||||
# url="https://brencher.rudolf.keenetic.link/state",
|
||||
# expected=checkPingF,
|
||||
#)
|
||||
checkPing = UrlCheck(
|
||||
url="https://brencher.rudolf.keenetic.link/state",
|
||||
expected=checkPingF,
|
||||
)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://brencher.rudolf.keenetic.link/",
|
||||
@@ -98,7 +98,7 @@ brencher2 = Environment(
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing,
|
||||
checkPing,
|
||||
logUrls
|
||||
],
|
||||
)
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="gitea",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
state = SharedStateHolderInMemory(unmerge=unmerge)
|
||||
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
desired_branches=state,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
stack_name="gitea",
|
||||
docker_compose_path="poc/gitea/stack-compose.yml",
|
||||
)
|
||||
|
||||
# checkPing1 = UrlCheck(
|
||||
# url="http://100.70.193.97:8087/api/status",
|
||||
# expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true',
|
||||
# )
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://gitea.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
__all__ = ["gitea"]
|
||||
gitea = Environment(
|
||||
id="gitea",
|
||||
state=state,
|
||||
pipeline=[
|
||||
clone,
|
||||
state,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing1,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
@@ -1,59 +0,0 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="hermes",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
state = SharedStateHolderInMemory(unmerge=unmerge)
|
||||
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
desired_branches=state,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
stack_name="hermes",
|
||||
docker_compose_path="poc/hermes/stack-compose.yml",
|
||||
)
|
||||
|
||||
checkPing1 = UrlCheck(
|
||||
url="http://100.70.193.97:8087/api/status",
|
||||
expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true',
|
||||
)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://hermes.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
__all__ = ["hermes"]
|
||||
hermes = Environment(
|
||||
id="hermes",
|
||||
state=state,
|
||||
pipeline=[
|
||||
clone,
|
||||
state,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
checkPing1,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
@@ -1,73 +0,0 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible")
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="hermes_infra",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
state = SharedStateHolderInMemory(unmerge=None)
|
||||
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
desired_branches=state,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
buildDocker = DockerComposeBuild(clone,
|
||||
docker_repo_username="",
|
||||
docker_repo_password="",
|
||||
docker_compose_path="hermes_squid/stack-compose.yml",
|
||||
docker_repo_url="https://registry.rudolf.keenetic.link",
|
||||
publish=False,
|
||||
build_cache = True,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
# "user_group": "1000:137"
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=buildDocker,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
stack_name="hermes_infra",
|
||||
docker_compose_path="hermes_squid/stack-compose.yml",
|
||||
)
|
||||
|
||||
# checkPing1 = UrlCheck(
|
||||
# url="http://100.70.193.97:8088/api/status",
|
||||
# expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true',
|
||||
# )
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://hermes.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
__all__ = ["hermes_infra"]
|
||||
hermes_infra = Environment(
|
||||
id="hermes_infra",
|
||||
state=state,
|
||||
pipeline=[
|
||||
clone,
|
||||
state,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing1,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
@@ -31,10 +31,10 @@ deployDocker = DockerSwarmDeploy(
|
||||
docker_compose_path="poc/immich/stack-compose.yml",
|
||||
)
|
||||
|
||||
#checkPing = UrlCheck(
|
||||
# url="https://immich.rudolf.keenetic.link/api/server/ping",
|
||||
# expected={"res": "pong"},
|
||||
#)
|
||||
checkPing = UrlCheck(
|
||||
url="https://immich.rudolf.keenetic.link/api/server/ping",
|
||||
expected={"res": "pong"},
|
||||
)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://immich.rudolf.keenetic.link",
|
||||
@@ -52,7 +52,7 @@ immich = Environment(
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
# checkPing,
|
||||
checkPing,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
|
||||
@@ -279,8 +279,7 @@ class DockerSwarmDeploy(AbstractStep[str]):
|
||||
swarmEnv = {k: v for k, v in dotenv_values(os.path.join(os.path.dirname(tmp_compose_path), ".env")).items()
|
||||
if v is not None}
|
||||
# merge_dicts(swarmEnv, env)
|
||||
result = subprocess.run(cmd, capture_output=True, text=True, cwd=os.path.dirname(tmp_compose_path))
|
||||
#, env=swarmEnv)
|
||||
result = subprocess.run(cmd, capture_output=True, text=True, cwd=os.path.dirname(tmp_compose_path), env=swarmEnv)
|
||||
os.remove(tmp_compose_path)
|
||||
if result.returncode != 0:
|
||||
logger.error(f"Stack deploy failed: {result.stderr}")
|
||||
|
||||
@@ -42,11 +42,8 @@ class SharedStateHolderInMemory(AbstractStep[SharedState], SharedStateHolder):
|
||||
def progress(self) -> SharedState:
|
||||
if len(self.state.branches) == 0:
|
||||
if self.unmerge:
|
||||
try:
|
||||
unmerge = self.unmerge.progress()
|
||||
self.state = replace(self.state, branches=unmerge.branches, token=uuid.uuid4().hex)
|
||||
except BaseException as e:
|
||||
logger.error("Unmerge failed: %s", e)
|
||||
unmerge = self.unmerge.progress()
|
||||
self.state = replace(self.state, branches=unmerge.branches, token=uuid.uuid4().hex)
|
||||
return self.state
|
||||
|
||||
|
||||
|
||||
+1
-9
@@ -129,7 +129,6 @@ class WebApp:
|
||||
|
||||
async def broadcast_environments(self, data: Any) -> None:
|
||||
await self.broadcast("environments", data)
|
||||
await self.broadcast("version", self.get_version())
|
||||
|
||||
async def broadcast_error(self, data: Any) -> None:
|
||||
await self.broadcast("error", data)
|
||||
@@ -141,16 +140,11 @@ class WebApp:
|
||||
|
||||
# --- Routes ---
|
||||
|
||||
def get_version(self) -> str:
|
||||
return os.getenv('VERSION', 'unknown') or 'unknown'
|
||||
|
||||
async def serve_index(self) -> FileResponse:
|
||||
return FileResponse(os.path.join(FRONTEND_DIR, 'index.html'))
|
||||
|
||||
async def serve_state(self) -> Response:
|
||||
state = self.get_global_envs_to_emit()
|
||||
state['version'] = self.get_version()
|
||||
return Response(content=custom_json_dumps(state), media_type="application/json")
|
||||
return Response(content=custom_json_dumps(self.get_global_envs_to_emit()), media_type="application/json")
|
||||
|
||||
async def serve_branches_route(self) -> Response:
|
||||
return Response(content=custom_json_dumps(self.get_global_branches_to_emit()), media_type="application/json")
|
||||
@@ -169,8 +163,6 @@ class WebApp:
|
||||
# Send initial state on connect and record it so duplicate broadcasts are suppressed
|
||||
branches_payload = custom_json_dumps({"branches": self.get_global_branches_to_emit()})
|
||||
envs_payload = custom_json_dumps({"environments": self.get_global_envs_to_emit()})
|
||||
version_payload = custom_json_dumps({"version": self.get_version()})
|
||||
await websocket.send_text(version_payload)
|
||||
await websocket.send_text(branches_payload)
|
||||
self.ws_connections[websocket]["branches"] = branches_payload
|
||||
await websocket.send_text(envs_payload)
|
||||
|
||||
+1
-2
@@ -16,8 +16,7 @@ services:
|
||||
- PYTHONUNBUFFERED=1
|
||||
- VIRTUAL_HOST=brencher.rudolf.keenetic.link
|
||||
- LETSENCRYPT_HOST=brencher.rudolf.keenetic.link
|
||||
- VERSION=${version}
|
||||
- PROFILES=brencher2,torrserv_proxy,immich,gmail_mcp,hermes,hermes_infra,gitea
|
||||
- PROFILES=brencher2,torrserv_proxy,immich,registry,gmail_mcp
|
||||
- SECONDARY_BRENCHER=http://host.docker.internal:5002
|
||||
deploy:
|
||||
replicas: 1
|
||||
|
||||
@@ -13,7 +13,6 @@ const closeStatus = document.getElementById('close-status');
|
||||
const refreshBranchesBtn = document.getElementById('refresh-branches');
|
||||
const applyChangesBtn = document.getElementById('apply-changes');
|
||||
const branchFilter = document.getElementById('branch-filter');
|
||||
const appVersion = document.getElementById('app-version');
|
||||
|
||||
// Branches list (flattened) for UI rendering: [{ envId, envName, branch, commits: [] }]
|
||||
let branches = [];
|
||||
@@ -478,8 +477,6 @@ function setupWebSockets() {
|
||||
filterBranches();
|
||||
renderJobs();
|
||||
showStatus('Environments updated.');
|
||||
} else if ('version' in message) {
|
||||
appVersion.textContent = `Version: ${message.version || 'unknown'}`;
|
||||
} else if ('error' in message) {
|
||||
console.error('Error from server:', message.error);
|
||||
if (message.error && message.error.code === 'BRANCH_STATE_CONFLICT' && message.error.envId) {
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<div class="container">
|
||||
<header>
|
||||
<h1>Brencher - Branch Merger</h1>
|
||||
<p class="version" id="app-version">Version: loading...</p>
|
||||
<div id="status-bar" class="status-bar hidden">
|
||||
<span id="status-message"></span>
|
||||
<button id="close-status">×</button>
|
||||
|
||||
@@ -15,13 +15,6 @@ body {
|
||||
padding: 32px;
|
||||
}
|
||||
|
||||
.version {
|
||||
color: #6c757d;
|
||||
font-family: monospace;
|
||||
font-size: 0.85rem;
|
||||
margin-top: -12px;
|
||||
}
|
||||
|
||||
.primary-button {
|
||||
background: #007bff;
|
||||
color: #fff;
|
||||
|
||||
Reference in New Issue
Block a user