diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b683cda..03caf6a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,3 @@ { - "recommendations": [ - "redhat.ansible", - "dhoeric.ansible-vault", - "esbenp.prettier-vscode" - ] + "recommendations": ["redhat.ansible", "esbenp.prettier-vscode"] } diff --git a/defaults/main.yml b/defaults/main.yml index 1ae5fbe..2e42586 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,4 +10,4 @@ renovate_github_token: "" renovate_log_level: info renovate_bot_username: renovate-bot renovate_webhook_secret: "" -renovate_docker_user_group: "1000:1000" +# renovate_docker_user_group: "1000:1000" diff --git a/templates/renovate-config.js.j2 b/templates/renovate-config.js.j2 index d4756a6..694d11c 100644 --- a/templates/renovate-config.js.j2 +++ b/templates/renovate-config.js.j2 @@ -4,7 +4,6 @@ module.exports = { endpoint: '{{ renovate_git_endpoint }}', token: '{{ renovate_git_token }}', platform: '{{ renovate_platform }}', - dockerUser: "{{ renovate_docker_user_group }}", autodiscover: true, onboardingConfig: { extends: ['config:base'], diff --git a/templates/renovate.j2 b/templates/renovate.j2 index 2bfcec1..5d73d80 100644 --- a/templates/renovate.j2 +++ b/templates/renovate.j2 @@ -1,4 +1,4 @@ #!/bin/bash -docker run --pull always --rm -v "/etc/renovate/config.js:/usr/src/app/config.js" -v "/var/run/docker.sock:/var/run/docker.sock" -v /tmp:/tmp -u "{{ renovate_docker_user_group }}" --env GITHUB_COM_TOKEN="{{ renovate_github_token }}" --env LOG_LEVEL={{ renovate_log_level }} {{ renovate_image_name }}:{{ renovate_image_tag }} renovate "$@" +docker run --pull always --group-add 0 --rm -v "/etc/renovate/config.js:/usr/src/app/config.js" -v "/var/run/docker.sock:/var/run/docker.sock" -v /tmp:/tmp -u "{{ renovate_docker_user_group }}" --env GITHUB_COM_TOKEN="{{ renovate_github_token }}" --env LOG_LEVEL={{ renovate_log_level }} {{ renovate_image_name }}:{{ renovate_image_tag }} renovate "$@" docker image prune -f \ No newline at end of file