From 215db1682d53102692254216e120b32612168ceb Mon Sep 17 00:00:00 2001
From: hygienic-books <hygienic-books@tentic.net>
Date: Sun, 24 Dec 2023 01:30:49 +0100
Subject: [PATCH] refactor(docker-compose): Set default ulimits even when var
 is set (but set to just an empty string)

---
 docker-compose/examples/grafana/compose.yaml         | 12 ++++++------
 docker-compose/examples/hashicorpvault/compose.yaml  |  6 +++---
 .../{{ cookiecutter.__project_slug }}/compose.yaml   | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docker-compose/examples/grafana/compose.yaml b/docker-compose/examples/grafana/compose.yaml
index 33374c3..a488af0 100644
--- a/docker-compose/examples/grafana/compose.yaml
+++ b/docker-compose/examples/grafana/compose.yaml
@@ -10,10 +10,10 @@ services:
             nginx:
                 condition: service_healthy
         ulimits:
-            nproc: ${ULIMIT_NPROC-65535}
+            nproc: ${ULIMIT_NPROC:-65535}
             nofile:
-                soft: ${ULIMIT_NPROC-65535}
-                hard: ${ULIMIT_NPROC-65535}
+                soft: ${ULIMIT_NPROC:-65535}
+                hard: ${ULIMIT_NPROC:-65535}
         extends:
             file: common-settings.yaml
             service: common-settings
@@ -42,10 +42,10 @@ services:
             retries: 60
             start_period: 2s
         ulimits:
-            nproc: ${ULIMIT_NPROC-65535}
+            nproc: ${ULIMIT_NPROC:-65535}
             nofile:
-                soft: ${ULIMIT_NPROC-65535}
-                hard: ${ULIMIT_NPROC-65535}
+                soft: ${ULIMIT_NPROC:-65535}
+                hard: ${ULIMIT_NPROC:-65535}
         extends:
             file: common-settings.yaml
             service: common-settings
diff --git a/docker-compose/examples/hashicorpvault/compose.yaml b/docker-compose/examples/hashicorpvault/compose.yaml
index abda9d1..4193f3d 100644
--- a/docker-compose/examples/hashicorpvault/compose.yaml
+++ b/docker-compose/examples/hashicorpvault/compose.yaml
@@ -6,10 +6,10 @@ services:
         networks:
             vault-default:
         ulimits:
-            nproc: ${ULIMIT_NPROC-65535}
+            nproc: ${ULIMIT_NPROC:-65535}
             nofile:
-                soft: ${ULIMIT_NPROC-65535}
-                hard: ${ULIMIT_NPROC-65535}
+                soft: ${ULIMIT_NPROC:-65535}
+                hard: ${ULIMIT_NPROC:-65535}
         extends:
             file: common-settings.yaml
             service: common-settings
diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/compose.yaml b/docker-compose/{{ cookiecutter.__project_slug }}/compose.yaml
index e74690c..1727ab0 100644
--- a/docker-compose/{{ cookiecutter.__project_slug }}/compose.yaml	
+++ b/docker-compose/{{ cookiecutter.__project_slug }}/compose.yaml	
@@ -31,10 +31,10 @@ services:
             start_period: 2s
         {%- endif %}
         ulimits:
-            nproc: ${ULIMIT_NPROC-65535}
+            nproc: ${ULIMIT_NPROC:-65535}
             nofile:
-                soft: ${ULIMIT_NPROC-65535}
-                hard: ${ULIMIT_NPROC-65535}
+                soft: ${ULIMIT_NPROC:-65535}
+                hard: ${ULIMIT_NPROC:-65535}
         extends:
             file: common-settings.yaml
             service: common-settings
@@ -58,10 +58,10 @@ services:
         networks:
             {{ cookiecutter.__service_slug }}-default:
         ulimits:
-            nproc: ${ULIMIT_NPROC-65535}
+            nproc: ${ULIMIT_NPROC:-65535}
             nofile:
-                soft: ${ULIMIT_NPROC-65535}
-                hard: ${ULIMIT_NPROC-65535}
+                soft: ${ULIMIT_NPROC:-65535}
+                hard: ${ULIMIT_NPROC:-65535}
         extends:
             file: common-settings.yaml
             service: common-settings