From fd122c3aba5a15f5144d18253d31bc731c87d01e Mon Sep 17 00:00:00 2001 From: Frederic Lemay <461102+flemay@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:30:46 +1100 Subject: [PATCH 1/6] update --- README.md | 28 +--------------------------- diagrams/generate.sh | 2 +- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 49f96fb..9eab617 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ # 3 Musketeers
- **Test, build, and deploy your apps from anywhere, the same way!** @@ -10,7 +9,6 @@ [![Build Status][linkGitHubActionsProjectBadge]][linkGitHubActionsProject] [![Netlify Status][linkNetlifyProjectBadge]][linkNetlifyProject] [![License][linkLicenseBadge]][linkLicense] -
@@ -52,31 +50,7 @@ The 3 Musketeers is a pattern for developing software in a repeatable and consistent manner. It leverages Make as an orchestration tool to test, build, run, and deploy applications using Docker and Docker Compose. The Make and Docker/Compose commands for each application are maintained as part of the application’s source code and are invoked in the same way whether run locally or on a CI/CD server. - -```mermaid -graph LR - host["**Host** - Linux - MacOS - Windows - CI/CD - ..."] - make["**Make** - test - build - run - deploy - ..."] - host-->make - make-->docker["Docker - Compose"] - container(("    **Container(s)**     - Go - Python - PostgreSQL - ...")) - docker-->container -``` +![pattern-overview](./diagrams/overview.mmd.svg) ## Why? diff --git a/diagrams/generate.sh b/diagrams/generate.sh index 5ed2c3b..1d8d4b0 100755 --- a/diagrams/generate.sh +++ b/diagrams/generate.sh @@ -9,6 +9,6 @@ find *.mmd -type f \ -p /puppeteer-config.json \ -b transparent \ -i {}' -printf "Copy *.svg to docs/guide/assets" +printf "Copy *.svg to docs/guide/assets\n" rm -fr /docs/guide/assets/*.svg cp *.svg /opt/docs/guide/assets From c40333ef427188d66748e21dfccd087089b897cf Mon Sep 17 00:00:00 2001 From: Frederic Lemay <461102+flemay@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:33:30 +1100 Subject: [PATCH 2/6] update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9eab617..8ee5f6d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ The 3 Musketeers is a pattern for developing software in a repeatable and consistent manner. It leverages Make as an orchestration tool to test, build, run, and deploy applications using Docker and Docker Compose. The Make and Docker/Compose commands for each application are maintained as part of the application’s source code and are invoked in the same way whether run locally or on a CI/CD server. -![pattern-overview](./diagrams/overview.mmd.svg) + ## Why? From 49fb6b218f5e5b43a8c822b73caa8f101b7b4c6e Mon Sep 17 00:00:00 2001 From: Frederic Lemay <461102+flemay@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:35:59 +1100 Subject: [PATCH 3/6] update --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 8ee5f6d..63d7ed3 100644 --- a/README.md +++ b/README.md @@ -80,14 +80,7 @@ _The demo was generated with VHS using the 3 Musketeers ([source](demo))._ Let's print out `Hello, World!` in the terminal using the 3 Musketeers. The command `make echo` will be calling Docker to run the command `echo 'Hello, World!'` inside a container. - -```mermaid -graph LR - host[Host]-->make[make echo] - make-->docker["Docker"] - docker-->container(("echo 'Hello, World!' - (container)")) -``` + ### Prerequisites From 945d9c5b31849435808267d179910e14af893e73 Mon Sep 17 00:00:00 2001 From: Frederic Lemay <461102+flemay@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:40:19 +1100 Subject: [PATCH 4/6] update --- diagrams/overview.mmd | 4 ++-- diagrams/overview.mmd.svg | 5 +++-- docs/guide/assets/overview.mmd.svg | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/diagrams/overview.mmd b/diagrams/overview.mmd index d211fce..464dba4 100644 --- a/diagrams/overview.mmd +++ b/diagrams/overview.mmd @@ -12,8 +12,8 @@ graph LR deploy ...`"] host-->make - make-->docker[Docker - Compose] + make-->docker["`**Docker** + **Compose**`"] container(("`**Command**   (container)   Go diff --git a/diagrams/overview.mmd.svg b/diagrams/overview.mmd.svg index 6e68dda..be893f9 100644 --- a/diagrams/overview.mmd.svg +++ b/diagrams/overview.mmd.svg @@ -1,4 +1,5 @@ -
+

Host
Linux
MacOS
Windows
CI/CD
...

-

Make
test
build
run
deploy
...

Docker
Compose
+

Make
test
build
run
deploy
...

+

Docker
Compose

Command
  (container)  
Go
Python
PostgreSQL
...

\ No newline at end of file diff --git a/docs/guide/assets/overview.mmd.svg b/docs/guide/assets/overview.mmd.svg index 6e68dda..be893f9 100644 --- a/docs/guide/assets/overview.mmd.svg +++ b/docs/guide/assets/overview.mmd.svg @@ -1,4 +1,5 @@ -
+

Host
Linux
MacOS
Windows
CI/CD
...

-

Make
test
build
run
deploy
...

Docker
Compose
+

Make
test
build
run
deploy
...

+

Docker
Compose

Command
  (container)  
Go
Python
PostgreSQL
...

\ No newline at end of file From ab84961e9be6ebac0c64e74d6be6a8332ca094d5 Mon Sep 17 00:00:00 2001 From: Frederic Lemay <461102+flemay@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:19:04 +1100 Subject: [PATCH 5/6] update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63d7ed3..4559f81 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ The 3 Musketeers is a pattern for developing software in a repeatable and consistent manner. It leverages Make as an orchestration tool to test, build, run, and deploy applications using Docker and Docker Compose. The Make and Docker/Compose commands for each application are maintained as part of the application’s source code and are invoked in the same way whether run locally or on a CI/CD server. - + ## Why? @@ -80,7 +80,7 @@ _The demo was generated with VHS using the 3 Musketeers ([source](demo))._ Let's print out `Hello, World!` in the terminal using the 3 Musketeers. The command `make echo` will be calling Docker to run the command `echo 'Hello, World!'` inside a container. - + ### Prerequisites From 8e20a9a144a3df62314c20f6ed672f0856d371ca Mon Sep 17 00:00:00 2001 From: Frederic Lemay <461102+flemay@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:19:47 +1100 Subject: [PATCH 6/6] update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4559f81..9058b98 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ The 3 Musketeers is a pattern for developing software in a repeatable and consistent manner. It leverages Make as an orchestration tool to test, build, run, and deploy applications using Docker and Docker Compose. The Make and Docker/Compose commands for each application are maintained as part of the application’s source code and are invoked in the same way whether run locally or on a CI/CD server. - + ## Why? @@ -80,7 +80,7 @@ _The demo was generated with VHS using the 3 Musketeers ([source](demo))._ Let's print out `Hello, World!` in the terminal using the 3 Musketeers. The command `make echo` will be calling Docker to run the command `echo 'Hello, World!'` inside a container. - + ### Prerequisites