Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Elao - App -Docker] Allow to configure default gitconfig & add defaults for safe dirs #408

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions elao.app.docker/.manala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ manala:
- .manala/certificates/ca.crt
- .manala/certificates/ca.key
- .manala/docker
- .manala/etc
- .manala/github
- .manala/make
- .manala/.dockerignore
Expand Down Expand Up @@ -144,6 +145,9 @@ system:
users: []
# @schema {"items": {"type": "object"}}
privileges: []
git:
# @schema {"type": ["null", "string"]}
config: ~
ssh:
client:
# @schema {"type": ["null", "string"]}
Expand Down
6 changes: 6 additions & 0 deletions elao.app.docker/.manala.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ system:
version: {{ .influxdb.version | toYaml }}
{{- end }}

git:
config: |
# Silence false positive dubious ownership errors
[safe]
directory = *

# ssh:
# client:
# config: |
Expand Down
5 changes: 5 additions & 0 deletions elao.app.docker/.manala/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,9 @@ if [ -n "${DOCKER_HOST}" ]; then
" &
fi

# Templates
if [ -d ".manala/etc" ]; then
GOMPLATE_LOG_FORMAT=simple gomplate --input-dir=.manala/etc --output-dir=/etc 2>/dev/null
fi

exec "$@"
5 changes: 5 additions & 0 deletions elao.app.docker/.manala/etc/gitconfig.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Git config template
# Don't edit this file directly. Instead, set config in project .manala.yaml, and run `manala up`.
{{ if .Vars.system.git.config }}
{{ .Vars.system.git.config }}
{{- end -}}
Loading