From 0042adba0087febf16649a52b1482cfcafd42ae0 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:16:03 +0200 Subject: [PATCH 1/9] feat(compose): Add a README.md section explaining Conventional Commits usage (#10) --- .../README.md | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/README.md b/docker-compose/{{ cookiecutter.__project_slug }}/README.md index 2cf37b4..93670f7 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/README.md +++ b/docker-compose/{{ cookiecutter.__project_slug }}/README.md @@ -167,3 +167,33 @@ build-context/ ``` When done head back up to [How to run](#how-to-run). + +# Development + +## Conventional commits + +This project uses [Conventional Commits](https://www.conventionalcommits.org/) for its commit messages. + +### Commit types + +Commit _types_ besides `fix` and `feat` are: + +- `refactor`: Keeping functionality while streamlining or otherwise improving function flow +- `docs`: Documentation for project or components + +### Commit scopes + +The following _scopes_ are known for this project. A Conventional Commits commit message may optionally use one of the following scopes or none: + +{%- if ',' in cookiecutter.__component_list_slug -%} +{%- set components = cookiecutter.__component_list_slug.split(',') -%} +{%- for component in components %} +- `{{ component }}`: A change to how the `{{ component }}` service component works +{%- endfor -%} +{%- else %} +- `{{ cookiecutter.__service_slug }}`: A change to how the `{{ cookiecutter.__service_slug }}` service component works +{%- endif %} +- `build`: Build-related changes such as `Dockerfile` fixes and features. +- `mount`: Volume or bind mount-related changes. +- `net`: Networking, IP addressing, routing changes +- `meta`: Affects the project's repo layout, file names etc. From 692d115d5c8fabc98d280ed6e32e0b01907cb1c8 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:18:50 +0200 Subject: [PATCH 2/9] refactor(compose): Adjust line breaks (#10) --- docker-compose/{{ cookiecutter.__project_slug }}/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/README.md b/docker-compose/{{ cookiecutter.__project_slug }}/README.md index 93670f7..edcda4d 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/README.md +++ b/docker-compose/{{ cookiecutter.__project_slug }}/README.md @@ -184,8 +184,7 @@ Commit _types_ besides `fix` and `feat` are: ### Commit scopes The following _scopes_ are known for this project. A Conventional Commits commit message may optionally use one of the following scopes or none: - -{%- if ',' in cookiecutter.__component_list_slug -%} +{%if ',' in cookiecutter.__component_list_slug -%} {%- set components = cookiecutter.__component_list_slug.split(',') -%} {%- for component in components %} - `{{ component }}`: A change to how the `{{ component }}` service component works From e6b8f35906cbd83c830a03138adbab6cea04a99a Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:21:46 +0200 Subject: [PATCH 3/9] feat(compose): Update Grafana example with Conventional commits paragraph (#10) --- docker-compose/examples/grafana/README.md | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docker-compose/examples/grafana/README.md b/docker-compose/examples/grafana/README.md index 752b408..3531378 100644 --- a/docker-compose/examples/grafana/README.md +++ b/docker-compose/examples/grafana/README.md @@ -111,3 +111,27 @@ build-context/ ``` When done head back up to [How to run](#how-to-run). + +# Development + +## Conventional commits + +This project uses [Conventional Commits](https://www.conventionalcommits.org/) for its commit messages. + +### Commit types + +Commit _types_ besides `fix` and `feat` are: + +- `refactor`: Keeping functionality while streamlining or otherwise improving function flow +- `docs`: Documentation for project or components + +### Commit scopes + +The following _scopes_ are known for this project. A Conventional Commits commit message may optionally use one of the following scopes or none: + +- `grafana`: A change to how the `grafana` service component works +- `nginx`: A change to how the `nginx` service component works +- `build`: Build-related changes such as `Dockerfile` fixes and features. +- `mount`: Volume or bind mount-related changes. +- `net`: Networking, IP addressing, routing changes +- `meta`: Affects the project's repo layout, file names etc. From 6c08ba37c619698a89aa6ea0199e52e5604b83a4 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:23:11 +0200 Subject: [PATCH 4/9] feat(compose): Update Vault example with Conventional commits paragraph (#10) --- .../examples/hashicorpvault/README.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docker-compose/examples/hashicorpvault/README.md b/docker-compose/examples/hashicorpvault/README.md index d23dfa2..c6451a0 100644 --- a/docker-compose/examples/hashicorpvault/README.md +++ b/docker-compose/examples/hashicorpvault/README.md @@ -107,3 +107,26 @@ build-context/ ``` When done head back up to [How to run](#how-to-run). + +# Development + +## Conventional commits + +This project uses [Conventional Commits](https://www.conventionalcommits.org/) for its commit messages. + +### Commit types + +Commit _types_ besides `fix` and `feat` are: + +- `refactor`: Keeping functionality while streamlining or otherwise improving function flow +- `docs`: Documentation for project or components + +### Commit scopes + +The following _scopes_ are known for this project. A Conventional Commits commit message may optionally use one of the following scopes or none: + +- `vault`: A change to how the `vault` service component works +- `build`: Build-related changes such as `Dockerfile` fixes and features. +- `mount`: Volume or bind mount-related changes. +- `net`: Networking, IP addressing, routing changes +- `meta`: Affects the project's repo layout, file names etc. From 795585260abd109ea240e1e60396b8274bada2c1 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:24:44 +0200 Subject: [PATCH 5/9] refactor(compose): Adjust spacing in Build paragraph (#10) --- docker-compose/{{ cookiecutter.__project_slug }}/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/README.md b/docker-compose/{{ cookiecutter.__project_slug }}/README.md index edcda4d..77ce47f 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/README.md +++ b/docker-compose/{{ cookiecutter.__project_slug }}/README.md @@ -32,10 +32,9 @@ docker context create fully.qualified.domain.name --docker 'host=ssh://root@full {%- if cookiecutter.build == "yes" %} ## Build - {%- set components = cookiecutter.__component_list_slug.split(',') -%} {% for component in components %} -{%- if loop.first %} +{% if loop.first %} FIXME We build the `{{ cookiecutter.__service_slug }}` image locally. Our adjustment to the official image is simply adding `/tmp/{{ cookiecutter.__service_slug }}` to it. See {% if ',' in cookiecutter.__component_list_slug %}[build-context/{{ cookiecutter.__service_slug }}/Dockerfile](build-context/{{ cookiecutter.__service_slug }}/Dockerfile){%- else %}[build-context/Dockerfile](build-context/Dockerfile){%- endif %}. We use `/tmp/{{ cookiecutter.__service_slug }}` to bind-mount a dedicated ZFS dataset for the application's `tmpdir` location. ``` From 31f67e3aadcd3a973df71ba2ea0ac54b4846a5dd Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:25:11 +0200 Subject: [PATCH 6/9] refactor(compose): Adjust spacing in Environment paragraph (#10) --- docker-compose/{{ cookiecutter.__project_slug }}/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/README.md b/docker-compose/{{ cookiecutter.__project_slug }}/README.md index 77ce47f..b831c9c 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/README.md +++ b/docker-compose/{{ cookiecutter.__project_slug }}/README.md @@ -13,6 +13,7 @@ Add a `COMPOSE_ENV` file and save its location as a shell variable along with th When everything's ready start {{ cookiecutter.__service_slug.capitalize() }} with Docker Compose, otherwise head down to [Initial setup](#initial-setup) first. ## Environment + ``` export COMPOSE_DIR='/opt/containers/{{ cookiecutter.__project_slug }}' export COMPOSE_CTX='ux_vilnius' From 387ef3bbbe71fa26d8d470d0c6bffd629a95f091 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:25:50 +0200 Subject: [PATCH 7/9] refactor(compose): Remove trailing newline (#10) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52c0543..5965767 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ component_list [grafana]: grafana,nginx Select build: 1 - no 2 - yes -Choose from 1, 2 [1]: +Choose from 1, 2 [1]: ``` The end result is a directory structure that has everything you need to hit the ground running. From e112d0ef8c4c972a17366ca1af8dbcd785b1bd9e Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:28:10 +0200 Subject: [PATCH 8/9] refactor(compose): Adjust spacing in example Environment paragraph (#10) --- docker-compose/examples/grafana/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/examples/grafana/README.md b/docker-compose/examples/grafana/README.md index 3531378..2d7f95b 100644 --- a/docker-compose/examples/grafana/README.md +++ b/docker-compose/examples/grafana/README.md @@ -13,6 +13,7 @@ Add a `COMPOSE_ENV` file and save its location as a shell variable along with th When everything's ready start Grafana with Docker Compose, otherwise head down to [Initial setup](#initial-setup) first. ## Environment + ``` export COMPOSE_DIR='/opt/containers/grafana' export COMPOSE_CTX='ux_vilnius' From c6e93b353d409d2fe3d4263f56ad4e7759e0302a Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 8 Oct 2023 17:28:50 +0200 Subject: [PATCH 9/9] refactor(compose): Adjust spacing in example Environment and Build paragraphs (#10) --- docker-compose/examples/hashicorpvault/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose/examples/hashicorpvault/README.md b/docker-compose/examples/hashicorpvault/README.md index c6451a0..68d400d 100644 --- a/docker-compose/examples/hashicorpvault/README.md +++ b/docker-compose/examples/hashicorpvault/README.md @@ -13,6 +13,7 @@ Add a `COMPOSE_ENV` file and save its location as a shell variable along with th When everything's ready start Vault with Docker Compose, otherwise head down to [Initial setup](#initial-setup) first. ## Environment + ``` export COMPOSE_DIR='/opt/containers/hashicorpvault' export COMPOSE_CTX='ux_vilnius' @@ -30,6 +31,7 @@ docker context create fully.qualified.domain.name --docker 'host=ssh://root@full ``` ## Build + FIXME We build the `vault` image locally. Our adjustment to the official image is simply adding `/tmp/vault` to it. See [build-context/Dockerfile](build-context/Dockerfile). We use `/tmp/vault` to bind-mount a dedicated ZFS dataset for the application's `tmpdir` location. ```