Compare commits

..

3 Commits

6 changed files with 19 additions and 4 deletions

View File

@@ -5,5 +5,5 @@
"__service_slug": "{{ cookiecutter.service.lower().replace(' ', '_').replace('-', '_') }}", "__service_slug": "{{ cookiecutter.service.lower().replace(' ', '_').replace('-', '_') }}",
"component_list": "{{ cookiecutter.__service_slug }}", "component_list": "{{ cookiecutter.__service_slug }}",
"__component_list_slug": "{{ cookiecutter.component_list.lower().replace(' ', '_').replace('-', '_') }}", "__component_list_slug": "{{ cookiecutter.component_list.lower().replace(' ', '_').replace('-', '_') }}",
"build": ["no", "yes"] "build": ["yes", "no"]
} }

View File

@@ -61,7 +61,7 @@ Create ZFS datasets and set permissions as needed.
* Change ownership * Change ownership
``` ```
chown -R 1000:1000 '/opt/docker-data/grafana-${COMPOSE_CTX}/grafana/data' chown -R 1000:1000 '/opt/docker-data/grafana-${COMPOSE_CTX}/grafana/data/'{*,.*}
``` ```
## Additional files ## Additional files

View File

@@ -8,6 +8,11 @@ services:
depends_on: depends_on:
nginx: nginx:
condition: service_healthy condition: service_healthy
ulimits:
nproc: ${ULIMIT_NPROC-65535}
nofile:
soft: ${ULIMIT_NPROC-65535}
hard: ${ULIMIT_NPROC-65535}
extends: extends:
file: common-settings.yml file: common-settings.yml
service: common-settings service: common-settings
@@ -34,6 +39,11 @@ services:
timeout: 1s timeout: 1s
retries: 60 retries: 60
start_period: 2s start_period: 2s
ulimits:
nproc: ${ULIMIT_NPROC-65535}
nofile:
soft: ${ULIMIT_NPROC-65535}
hard: ${ULIMIT_NPROC-65535}
extends: extends:
file: common-settings.yml file: common-settings.yml
service: common-settings service: common-settings

View File

@@ -65,7 +65,7 @@ Create ZFS datasets and set permissions as needed.
* Change ownership * Change ownership
``` ```
chown -R 1000:1000 '/opt/docker-data/vault-${COMPOSE_CTX}/vault/data' chown -R 1000:1000 '/opt/docker-data/vault-${COMPOSE_CTX}/vault/data/'{*,.*}
``` ```
## Additional files ## Additional files

View File

@@ -4,6 +4,11 @@ services:
container_name: "vault-${CONTEXT}" container_name: "vault-${CONTEXT}"
networks: networks:
vault-default: vault-default:
ulimits:
nproc: ${ULIMIT_NPROC-65535}
nofile:
soft: ${ULIMIT_NPROC-65535}
hard: ${ULIMIT_NPROC-65535}
extends: extends:
file: common-settings.yml file: common-settings.yml
service: common-settings service: common-settings

View File

@@ -89,7 +89,7 @@ Create ZFS datasets and set permissions as needed.
{%- set components = cookiecutter.__component_list_slug.split(',') -%} {%- set components = cookiecutter.__component_list_slug.split(',') -%}
{% for component in components %} {% for component in components %}
{%- if loop.first %} {%- if loop.first %}
chown -R 1000:1000 '/opt/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ cookiecutter.__service_slug }}/data' chown -R 1000:1000 '/opt/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ cookiecutter.__service_slug }}/data/'{*,.*}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
``` ```