Registry wo tests (#54)
* registry * x * docker check by version * UI * x * x --------- Co-authored-by: GitHub Actions <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
@@ -302,6 +302,7 @@ class App:
|
||||
import configs.brencher_local1
|
||||
import configs.torrserv_proxy
|
||||
import configs.immich
|
||||
import configs.registry
|
||||
environments_l: List[Environment] = [
|
||||
configs.brencher.brencher,
|
||||
configs.brencher2.brencher2,
|
||||
@@ -309,6 +310,7 @@ class App:
|
||||
configs.brencher_local1.brencher_local1,
|
||||
configs.torrserv_proxy.torrserv_proxy,
|
||||
configs.immich.immich,
|
||||
configs.registry.registry,
|
||||
]
|
||||
environments = {e.id: e for e in environments_l}
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
clone = GitClone(branchNamePrefix="ansible")
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
push=False,
|
||||
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
@@ -14,6 +13,7 @@ checkoutMerged = CheckoutMerged(clone,
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="immich",
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
|
||||
clone = GitClone(branchNamePrefix="ansible")
|
||||
checkoutMerged = CheckoutMerged(clone,
|
||||
push=False,
|
||||
git_user_email="rudolfss13@gmail.com",
|
||||
git_user_name="brencher_bot"
|
||||
)
|
||||
|
||||
dockerSwarmCheck = DockerSwarmCheck(
|
||||
stack_name="registry",
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version
|
||||
},
|
||||
stack_name="registry",
|
||||
docker_compose_path="docker-compose-registry.yaml",
|
||||
)
|
||||
unmerge = GitUnmerge(clone, dockerSwarmCheck)
|
||||
|
||||
checkPing = UrlCheck(
|
||||
url="https://registry.rudolf.keenetic.link/v2/",
|
||||
expected={},
|
||||
)
|
||||
logUrls = SimpleLog(message={
|
||||
"userLinks": {
|
||||
"App": "https://registry.rudolf.keenetic.link",
|
||||
}
|
||||
})
|
||||
|
||||
__all__ = ["registry"]
|
||||
registry = Environment(
|
||||
id="registry",
|
||||
branches=[("ansible/master", "HEAD")],
|
||||
dry=False,
|
||||
repo="https://github.com/rudolf1/uber_backup.git",
|
||||
pipeline=[
|
||||
clone,
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
deployDocker,
|
||||
checkPing,
|
||||
logUrls
|
||||
]
|
||||
)
|
||||
+1
-1
@@ -16,7 +16,7 @@ services:
|
||||
- PYTHONUNBUFFERED=1
|
||||
- VIRTUAL_HOST=brencher.rudolf.keenetic.link
|
||||
- LETSENCRYPT_HOST=brencher.rudolf.keenetic.link
|
||||
- PROFILES=brencher2,torrserv_proxy,immich
|
||||
- PROFILES=brencher2,torrserv_proxy,immich,registry
|
||||
- SLAVE_BRENCHER=http://host.docker.internal:5002
|
||||
# - SLAVE_BRENCHER='http://100.70.193.97:5002' .venv/bin/python3 backend/app.py brencher_localX
|
||||
deploy:
|
||||
|
||||
+8
-2
@@ -119,7 +119,14 @@ function branchHasCommit(envId, branchName, commit) {
|
||||
}) || false;
|
||||
}
|
||||
|
||||
let renderedBranches = []
|
||||
|
||||
function renderBranches() {
|
||||
if (JSON.stringify(filteredBranches) === JSON.stringify(renderedBranches)) {
|
||||
return
|
||||
}
|
||||
checkForPendingChanges();
|
||||
|
||||
const branchesToShow = filteredBranches.length > 0 || branchFilter.value.trim() ? filteredBranches : branches;
|
||||
if (!branchesToShow.length) {
|
||||
branchesList.innerHTML = '<p class="loading">No branches found.</p>';
|
||||
@@ -173,7 +180,6 @@ function renderBranches() {
|
||||
</table>
|
||||
</div>`;
|
||||
}).join('');
|
||||
|
||||
// Event wiring
|
||||
branchesList.querySelectorAll('input[type="checkbox"]').forEach(cb => {
|
||||
cb.onchange = e => {
|
||||
@@ -215,6 +221,7 @@ function renderBranches() {
|
||||
updateBranchCommit(envId, branch, commitId || 'HEAD');
|
||||
};
|
||||
});
|
||||
renderedBranches = filteredBranches;
|
||||
}
|
||||
|
||||
function updateBranchCommit(envId, branch, commit) {
|
||||
@@ -396,7 +403,6 @@ function setupSocketIO() {
|
||||
|
||||
filterBranches();
|
||||
renderJobs();
|
||||
checkForPendingChanges();
|
||||
showStatus('Environments updated.');
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user