From 3176424d269ac500670514ae4efc3be73b3e42a7 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Sat, 22 Apr 2023 12:05:52 +0200 Subject: [PATCH] fix diagrams --- README.md | 57 ++------------------------------------ doc/ciAndArtifacts.svg | 1 + doc/diagrams.md | 62 ++++++++++++++++++++++++++++++++++++++++++ doc/repositories.svg | 1 + 4 files changed, 66 insertions(+), 55 deletions(-) create mode 100644 doc/ciAndArtifacts.svg create mode 100644 doc/diagrams.md create mode 100644 doc/repositories.svg diff --git a/README.md b/README.md index f930f54..54d8b7c 100644 --- a/README.md +++ b/README.md @@ -26,61 +26,8 @@ But in the time beeing we will not livbe in this perfect world. So we present ou At the moment our CI is running on gitlab, so thats our current model -```mermaid -C4Context - Person(community, "Community") - Person(maint, "Maintainer") - - System_Boundary(gitlab, "GitLab") { - System(gitlab-repo, "GitLab") - System(gitlab-ci, "GitLab-CI") - } - System_Boundary(codeberg, "Codeberg") { - System(cb-repo, "Codeberg") - } - System_Boundary(gitea, "repo.prod.meissa.de") { - System(gitea-repo, "repo") - } - System_Boundary(github, "github") { - System(github-repo, "GitHub") - } - - Rel(maint, gitlab-repo, "interact") - Rel(community, gitlab-repo, "interact") - - Rel(gitlab-repo, gitea-repo, "mirror on pull") - Rel(gitea-repo, github-repo, "mirror on push") - Rel(gitea-repo, cb-repo, "mirror on push") - - UpdateLayoutConfig($c4ShapeInRow="3", $c4BoundaryInRow="2") -``` +![](doc/repositories.svg) ## Artefacts & CI -```mermaid -C4Context - System_Boundary(gitlab, "GitLab") { - System(gitlab-repo, "GitLab") - System(gitlab-ci, "GitLab-CI") - } - System_Boundary(gitea, "repo.prod.meissa.de") { - System(gitea-repo, "repo") - System(gitea-release-pages, "release pages") - System(gitea-artifacts, "artifacts") - } - System_Boundary(art, "Artifact Repositories") { - System(pypi, "Pypi") - System(docker, "Docker Hub") - System(npm, "Npm") - System(clojars, "Clojars") - } - - Rel(gitlab-ci, gitea-release-pages, "create release & upload changelog") - Rel(gitlab-ci, gitea-artifacts, "artifact upload") - Rel(gitlab-ci, clojars, "artifact upload") - Rel(gitlab-ci, pypi, "artifact upload") - Rel(gitlab-ci, npm, "artifact upload") - Rel(gitlab-ci, docker, "artifact upload") - - UpdateLayoutConfig($c4ShapeInRow="3", $c4BoundaryInRow="2") -``` \ No newline at end of file +![](/home/jem/repo/opensource/federate-your-repos/doc/ciAndArtifacts.svg) \ No newline at end of file diff --git a/doc/ciAndArtifacts.svg b/doc/ciAndArtifacts.svg new file mode 100644 index 0000000..d4500b5 --- /dev/null +++ b/doc/ciAndArtifacts.svg @@ -0,0 +1 @@ +<<system>>GitLab<<system>>GitLab-CIGitLab[ENTERPRISE]<<system>>repo<<system>>release pages<<system>>artifactsrepo.prod.meissa.de[ENTERPRISE]<<system>>Pypi<<system>>Docker Hub<<system>>Npm<<system>>ClojarsArtifact Repositories[ENTERPRISE]create release & upload changelogartifact uploadartifact uploadartifact uploadartifact uploadartifact upload \ No newline at end of file diff --git a/doc/diagrams.md b/doc/diagrams.md new file mode 100644 index 0000000..1523413 --- /dev/null +++ b/doc/diagrams.md @@ -0,0 +1,62 @@ +# Mirroring + +At the moment our CI is running on gitlab, so thats our current model + +```mermaid +C4Context + Person(community, "Community") + Person(maint, "Maintainer") + + System_Boundary(gitlab, "GitLab") { + System(gitlab-repo, "GitLab") + System(gitlab-ci, "GitLab-CI") + } + System_Boundary(codeberg, "Codeberg") { + System(cb-repo, "Codeberg") + } + System_Boundary(gitea, "repo.prod.meissa.de") { + System(gitea-repo, "repo") + } + System_Boundary(github, "github") { + System(github-repo, "GitHub") + } + + Rel(maint, gitlab-repo, "interact") + Rel(community, gitlab-repo, "interact") + + Rel(gitlab-repo, gitea-repo, "mirror on pull") + Rel(gitea-repo, github-repo, "mirror on push") + Rel(gitea-repo, cb-repo, "mirror on push") + + UpdateLayoutConfig($c4ShapeInRow="3", $c4BoundaryInRow="2") +``` + +## Artefacts & CI + +```mermaid +C4Context + System_Boundary(gitlab, "GitLab") { + System(gitlab-repo, "GitLab") + System(gitlab-ci, "GitLab-CI") + } + System_Boundary(gitea, "repo.prod.meissa.de") { + System(gitea-repo, "repo") + System(gitea-release-pages, "release pages") + System(gitea-artifacts, "artifacts") + } + System_Boundary(art, "Artifact Repositories") { + System(pypi, "Pypi") + System(docker, "Docker Hub") + System(npm, "Npm") + System(clojars, "Clojars") + } + + Rel(gitlab-ci, gitea-release-pages, "create release & upload changelog") + Rel(gitlab-ci, gitea-artifacts, "artifact upload") + Rel(gitlab-ci, clojars, "artifact upload") + Rel(gitlab-ci, pypi, "artifact upload") + Rel(gitlab-ci, npm, "artifact upload") + Rel(gitlab-ci, docker, "artifact upload") + + UpdateLayoutConfig($c4ShapeInRow="3", $c4BoundaryInRow="2") +``` \ No newline at end of file diff --git a/doc/repositories.svg b/doc/repositories.svg new file mode 100644 index 0000000..5f977fc --- /dev/null +++ b/doc/repositories.svg @@ -0,0 +1 @@ +<<component>>Build and Mixin<<component>>Application<<component>>Domain<<component>>InfrastructureuseuseuseuseArchitectrue od dda-devops-build \ No newline at end of file