opendev/system-config
Code Issues Proposed changes

Merge "Update the gerritbot-matrix image to support arbitrary uid"

Browse Source
This commit is contained in:
Zuul 2021-12-06 18:18:53 +00:00 committed by Gerrit Code Review
commit 3026c0a77b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/matrix-gerritbot/defaults/main.yaml
View File

@ -1,6 +1,6 @@
gerritbot_gid: 11000 gerritbot_gid: 11000
gerritbot_uid: 11000 gerritbot_uid: 11000
gerritbot_matrix_version: 4aeeac8 gerritbot_matrix_version: g2wr8krm32cp8afrw9qq3cxilsy2nsk0
gerritbot_matrix_image: quay.io/software-factory/gerritbot-matrix:{{ gerritbot_matrix_version }} gerritbot_matrix_image: quay.io/software-factory/gerritbot-matrix:{{ gerritbot_matrix_version }}
gerritbot_matrix_prometheus_port: 9001 gerritbot_matrix_prometheus_port: 9001

11
playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
View File

@ -6,14 +6,7 @@ services:
gerritbot-matrix: gerritbot-matrix:
image: {{ gerritbot_matrix_image }} image: {{ gerritbot_matrix_image }}
network_mode: host network_mode: host
# Temporarily (I hope) undo the gerritbot user override as the process user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
# complains with:
# 2021-11-19 17:50:14.995 [ThreadId 4]: Session created for: UserID "@gerrit:opendev.org"
#
# Warning: Could not get or create the default cache directory:
#
# gerritbot-matrix: <stderr>: hPutChar: invalid argument (invalid character)
#user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
restart: always restart: always
logging: logging:
driver: syslog driver: syslog
@ -24,7 +17,7 @@ services:
MATRIX_IDENTITY_TOKEN: {{ gerritbot_matrix_identity_token }} MATRIX_IDENTITY_TOKEN: {{ gerritbot_matrix_identity_token }}
volumes: volumes:
- /var/lib/matrix-gerritbot/config:/config:ro - /var/lib/matrix-gerritbot/config:/config:ro
- /var/lib/matrix-gerritbot/ssh:/root/.ssh:ro - /var/lib/matrix-gerritbot/ssh:/home/bot/.ssh:ro
healthcheck: healthcheck:
test: "gerritbot-matrix check {{ gerritbot_matrix_prometheus_port }}" test: "gerritbot-matrix check {{ gerritbot_matrix_prometheus_port }}"
retries: 6 retries: 6