diff --git a/Dockerfile b/Dockerfile index 04019d0..5d884c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,8 @@ FROM python:3.12-slim RUN apt-get update && apt-get install -y graphviz wget && rm -rf /var/lib/apt/lists/* # Install fonts -RUN mkdir /usr/share/fonts/truetype/Avenir-Next && \ - wget -qO- https://raw.githubusercontent.com/prchann/fonts/main/Avenir%20Next/400%20Regular/avenir-next-regular.ttf > /usr/share/fonts/truetype/Avenir-Next/Avenir-Next.ttf && \ - fc-cache -fv +COPY fonts /usr/share/fonts/truetype/custom +RUN fc-cache -fv # Set the working directory WORKDIR /app diff --git a/examples/full.example.yml b/examples/full.example.yml index def76fa..c63b371 100644 --- a/examples/full.example.yml +++ b/examples/full.example.yml @@ -2,7 +2,7 @@ ecosystem: style: diagramEngine: neato diagramOverlap: prism - diagramOverlapScaling: 4.5 + diagramOverlapScaling: 4 diagramOverlapShrink: true diagramPadding: 0.5 diagramRankdir: LR @@ -10,8 +10,8 @@ ecosystem: groupLabelStyle: rounded groupLabelFontname: Avenir Next, Helvetica groupLabelFontcolor: "#333333" - groupLabelFontsize: 25 - groupLabelMargin: 0.3 + groupLabelFontsize: 18 + groupLabelMargin: 0.22 defaultLogoScale: 1.5 centralTool: label: Kubernetes diff --git a/examples/full.example_logos.png b/examples/full.example_logos.png index bf78244..a8f9475 100644 Binary files a/examples/full.example_logos.png and b/examples/full.example_logos.png differ diff --git a/examples/full.example_logos.svg b/examples/full.example_logos.svg index f64ab0b..e3af522 100644 --- a/examples/full.example_logos.svg +++ b/examples/full.example_logos.svg @@ -1,8 +1,8 @@ - + --> + %3 - + cluster_cluster_management @@ -29,189 +29,189 @@ label_cluster_management - -Cluster -Management + +Cluster +Management Kubernetes->label_cluster_management - - + + label_cloud_integration - -Cloud -Integration + +Cloud +Integration Kubernetes->label_cloud_integration - - + + label_continuous_deployment - -Continuous -Deployment + +Continuous +Deployment Kubernetes->label_continuous_deployment - - + + label_observability - -Observability + +Observability Kubernetes->label_observability - - + + label_networking - -Networking + +Networking Kubernetes->label_networking - - + + label_security__compliance - -Security -& Compliance + +Security +& Compliance Kubernetes->label_security__compliance - - + + label_developer_enablement - -Developer -Enablement + +Developer +Enablement Kubernetes->label_developer_enablement - - + + label_cluster_management->Rancher - - + + label_cloud_integration->AWS - - + + label_continuous_deployment->Helm - - + + label_continuous_deployment->Argo - - + + label_observability->Grafana - - + + label_observability->Loki - - + + label_observability->Tempo - - + + label_observability->Prometheus - - + + label_networking->Istio - - + + label_networking->CoreDNS - - + + label_security__compliance->Vault - - + + label_developer_enablement->Backstage - - + + - - + \ No newline at end of file diff --git a/examples/full.example_text.svg b/examples/full.example_text.svg index 97c77e5..f9259c0 100644 --- a/examples/full.example_text.svg +++ b/examples/full.example_text.svg @@ -4,11 +4,11 @@ - - + + %3 - + cluster_cluster_management @@ -33,241 +33,241 @@ Kubernetes - -Kubernetes + +Kubernetes label_cluster_management - -Cluster -Management + +Cluster +Management Kubernetes->label_cluster_management - - + + label_cloud_integration - -Cloud -Integration + +Cloud +Integration Kubernetes->label_cloud_integration - - + + label_continuous_deployment - -Continuous -Deployment + +Continuous +Deployment Kubernetes->label_continuous_deployment - - + + label_observability - -Observability + +Observability Kubernetes->label_observability - - + + label_networking - -Networking + +Networking Kubernetes->label_networking - - + + label_security__compliance - -Security -& Compliance + +Security +& Compliance Kubernetes->label_security__compliance - - + + label_developer_enablement - -Developer -Enablement + +Developer +Enablement Kubernetes->label_developer_enablement - - + + Rancher - -Rancher + +Rancher label_cluster_management->Rancher - - + + AWS - -AWS + +AWS label_cloud_integration->AWS - - + + Helm - -Helm + +Helm label_continuous_deployment->Helm - - + + Argo - -Argo + +Argo label_continuous_deployment->Argo - - + + Grafana - -Grafana + +Grafana label_observability->Grafana - - + + Loki - -Loki + +Loki label_observability->Loki - - + + Tempo - -Tempo + +Tempo label_observability->Tempo - - + + Prometheus - -Prometheus + +Prometheus label_observability->Prometheus - - + + Istio - -Istio + +Istio label_networking->Istio - - + + CoreDNS - -CoreDNS + +CoreDNS label_networking->CoreDNS - - + + Vault - -Vault + +Vault label_security__compliance->Vault - - + + Backstage - -Backstage + +Backstage label_developer_enablement->Backstage - - + + diff --git a/examples/minimal.example_logos.png b/examples/minimal.example_logos.png index ff07e0c..a20b11c 100644 Binary files a/examples/minimal.example_logos.png and b/examples/minimal.example_logos.png differ diff --git a/examples/minimal.example_logos.svg b/examples/minimal.example_logos.svg index a0f9e74..621d331 100644 --- a/examples/minimal.example_logos.svg +++ b/examples/minimal.example_logos.svg @@ -14,7 +14,7 @@ label_cloud_integration - + Cloud Integration @@ -27,7 +27,7 @@ label_cluster_management - + Cluster Management diff --git a/examples/minimal.example_text.svg b/examples/minimal.example_text.svg index 84a9cc9..1894bbc 100644 --- a/examples/minimal.example_text.svg +++ b/examples/minimal.example_text.svg @@ -24,7 +24,7 @@ label_cloud_integration - + Cloud Integration @@ -37,7 +37,7 @@ label_cluster_management - + Cluster Management diff --git a/fonts/Avenir Next.ttc b/fonts/Avenir Next.ttc new file mode 100644 index 0000000..d2e05c1 Binary files /dev/null and b/fonts/Avenir Next.ttc differ diff --git a/pyproject.toml b/pyproject.toml index 5257a60..d142cd6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "logo-diagram-generator" -version = "0.2.1" +version = "0.2.2" description = "Generate SVG diagrams of a (tech) ecosystem, using logos from each tool organised into groups around a central logo" authors = ["Andrew Beveridge "] license = "MIT"