diff --git a/Jenkins Docker Umgebung.canvas b/Jenkins Docker Umgebung.canvas new file mode 100644 index 00000000..fdd6c6f4 --- /dev/null +++ b/Jenkins Docker Umgebung.canvas @@ -0,0 +1,13 @@ +{ + "nodes":[ + {"id":"1fa81fd89c6de237","x":-380,"y":-190,"width":540,"height":270,"color":"1","type":"group","label":"Docker Host"}, + {"type":"text","text":"Docker-in-Docker Container\ndocker:dind","id":"c2d1c62825b6138c","x":-90,"y":-170,"width":230,"height":90,"color":"6"}, + {"type":"text","text":"Jenkins Agent\njenkins:agent","id":"4fb299b75e9bba66","x":-90,"y":-40,"width":230,"height":100,"color":"6"}, + {"id":"35f1fbbd96262a78","x":-360,"y":-170,"width":220,"height":90,"color":"6","type":"text","text":"Jenkins Container\njenkins:jenkins"} + ], + "edges":[ + {"id":"2942d4445600f290","fromNode":"35f1fbbd96262a78","fromSide":"right","toNode":"c2d1c62825b6138c","toSide":"left"}, + {"id":"02864d4d5ef134e6","fromNode":"35f1fbbd96262a78","fromSide":"bottom","toNode":"4fb299b75e9bba66","toSide":"left","color":"3","label":"build odoo:odoo"}, + {"id":"cad12ed8c9f45c25","fromNode":"c2d1c62825b6138c","fromSide":"bottom","toNode":"4fb299b75e9bba66","toSide":"top"} + ] +} \ No newline at end of file diff --git a/Jenkins.md b/Jenkins.md index 4a88b9d0..b5fe6785 100644 --- a/Jenkins.md +++ b/Jenkins.md @@ -6,4 +6,10 @@ tags: Website: -[[Jenkins Handbuch]] \ No newline at end of file +Weiterführende Links: + +* [[Jenkins Handbuch]] + +## Docker Umgebung + +![[Jenkins Docker Umgebung.canvas|Jenkins Docker Umgebung]] \ No newline at end of file diff --git a/serverumgebung.svg b/build-umgebung.svg similarity index 70% rename from serverumgebung.svg rename to build-umgebung.svg index 05b69bc2..6bfe7a5f 100644 --- a/serverumgebung.svg +++ b/build-umgebung.svg @@ -6,7 +6,7 @@ Odoo Environment - Drone + Jenkins GitHub Repo @@ -108,35 +108,145 @@ - odoo01 + + + +

odoo01

+ + - main pipeline + + + +

main pipeline

+ + - main branch + + + +

main branch

+ + - int branch + + + +

int branch

+ + - dev branch + + + +

dev branch

+ + - dev pipeline + + + +

dev pipeline

+ + - int pipeline + + + +

int pipeline

+ + - mailhog01 + + + +

mailhog01

+ + - odoo03 + + + +

odoo03

+ + - odoo02 + + + +

odoo02

+ + - nginx01- odoo.example.com- int.example.com- dev.example.com- mail.example.com- drone.example.com + nginx01- odoo.example.com- int.example.com- dev.example.com- mail.example.com- drone.example.com \ No newline at end of file diff --git a/build.js b/build.js index 63622058..8a6a7ba8 100644 --- a/build.js +++ b/build.js @@ -81,24 +81,41 @@ function renderNode(node) { const fontWeight = 'bold' let textOffsetX = 15 - let textOffsetY = 30 + let textOffsetY = 0 let fontColor = '#2c2d2c' - let text = node['text'] - let fontSize = 16 + let fontSize = 15 let fontFamily = 'Roboto, Oxygen, Ubuntu, Cantarell, sans-serif' - - // Process multiline text + let content = '' - if (text && text.split('\n').length > 1) { - let spans = '' - for (const line of text.split('\n')) { - spans += `${line}` - } - text = spans - textOffsetY = 10 + // Render default text + + if (node['text']) { + content = ` + + +

${node['text']}

+ + ` } - // Link markdown file + // Render multiline text + + if (node['text'] && node['text'].split('\n').length > 1) { + let spans = '' + for (const line of node['text'].split('\n')) { + spans += `${line}` + } + textOffsetY = 10 + content = `${spans}` + } + + // Render linked markdown file if (node['file'] && node['file'].endsWith('.md')) { title = node['file'].replace('.md', '') @@ -107,11 +124,10 @@ function renderNode(node) { fontSize = 28 textOffsetX = 30 textOffsetY = 45 + content = `${text}` } - - content = `${text}` - // If file is not markdown render as image + // Render image if (node['file'] && !node['file'].endsWith('.md')) { filePath = node['file'] diff --git a/canvas.svg b/canvas.svg index 9c50c40b..17d9b200 100644 --- a/canvas.svg +++ b/canvas.svg @@ -30,7 +30,18 @@ - Canvas in Obsidian erstellen + + + +

Canvas in Obsidian erstellen

+ + Obsidian @@ -39,5 +50,16 @@ - Export als SVG + + + +

Export als SVG

+ + \ No newline at end of file diff --git a/jenkins-docker-umgebung.svg b/jenkins-docker-umgebung.svg new file mode 100644 index 00000000..13d25040 --- /dev/null +++ b/jenkins-docker-umgebung.svg @@ -0,0 +1,40 @@ + + + + + + Docker Host + + + + + + + + + + + + + + + + + + + + + + + + + + + Docker-in-Docker Containerdocker:dind + + + Jenkins Agentjenkins:agent + + + Jenkins Containerjenkins:jenkins + \ No newline at end of file diff --git a/odoo-cd-pipeline.svg b/odoo-cd-pipeline.svg new file mode 100644 index 00000000..c64761ae --- /dev/null +++ b/odoo-cd-pipeline.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Clone Github-Repo

+ + + + + + + +

Clone Submodules

+ + + + + + + +

Start containers: Odoo and Postgres

+ + + + + + + +

Init Odoo database

+ + + + + + + +

Run Odoo module tests

+ + + + + + + +

Deploy to environment

+ + + \ No newline at end of file diff --git a/odoo-continuous-delivery.svg b/odoo-continuous-delivery.svg index 2dafdf2f..8a034d77 100644 --- a/odoo-continuous-delivery.svg +++ b/odoo-continuous-delivery.svg @@ -30,11 +30,44 @@ - Production (main) + + + +

Production (main)

+ + - Staging (int) + + + +

Staging (int)

+ + - Development (dev) + + + +

Development (dev)

+ + \ No newline at end of file diff --git a/s3.svg b/s3.svg index 59242cc5..6b54afa1 100644 --- a/s3.svg +++ b/s3.svg @@ -35,19 +35,63 @@ - Aerodoo + + + +

Aerodoo

+ + - Caluma + + + +

Caluma

+ + - Odoo + + + +

Odoo

+ + Aerodoo - Infrastruktur + + + +

Infrastruktur

+ +