From 990b9c1905c8b75c152fa1852616d117ee44c40e Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Mon, 6 Dec 2021 20:33:00 +0000 Subject: [PATCH] Update the gerritbot-matrix image to support arbitrary uid with docker This change pulls in https://softwarefactory-project.io/r/c/software-factory/gerritbot-matrix/+/23348 to achieve abritary uid with docker. Change-Id: I43198af4feebd7f175ffdede376e2e4d19928d62 --- playbooks/roles/matrix-gerritbot/defaults/main.yaml | 2 +- .../roles/matrix-gerritbot/templates/docker-compose.yaml.j2 | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/playbooks/roles/matrix-gerritbot/defaults/main.yaml b/playbooks/roles/matrix-gerritbot/defaults/main.yaml index 841cbd208d..63090dac21 100644 --- a/playbooks/roles/matrix-gerritbot/defaults/main.yaml +++ b/playbooks/roles/matrix-gerritbot/defaults/main.yaml @@ -1,6 +1,6 @@ gerritbot_gid: 11000 gerritbot_uid: 11000 -gerritbot_matrix_version: g2wr8krm32cp8afrw9qq3cxilsy2nsk0 +gerritbot_matrix_version: i0gwp8pwh44myqmzzif3qgissh3mavkm gerritbot_matrix_image: quay.io/software-factory/gerritbot-matrix:{{ gerritbot_matrix_version }} gerritbot_matrix_prometheus_port: 9001 diff --git a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 index b857cce0ce..9baedbabd0 100644 --- a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 @@ -6,9 +6,7 @@ services: gerritbot-matrix: image: {{ gerritbot_matrix_image }} network_mode: host - # TODO: Continue sorting out how to make this work with the - # image published by SF.io - #user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}" + user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}" restart: always logging: driver: syslog