Merge branch 'jts/repair-mailroom-health' into 'master'

Mailroom: Remove the wrapper script

See merge request gitlab-org/build/CNG!309

gitlab-mailroom/Dockerfile

@@ -7,12 +7,9 @@ ARG MAILROOM_VERSION=0.9.1
 ARG GITLAB_USER=git
 
 RUN adduser --disabled-password --gecos 'GitLab' ${GITLAB_USER} && \
-    sed -i "s/${GITLAB_USER}:!/${GITLAB_USER}:*/" /etc/shadow && \
-    mkdir /var/log/gitlab && \
-    touch /var/log/gitlab/mail_room.log && \
-    chown -R ${GITLAB_USER}:${GITLAB_USER} /var/log/gitlab
+    sed -i "s/${GITLAB_USER}:!/${GITLAB_USER}:*/" /etc/shadow
 
 COPY scripts/  /scripts/
 
 RUN MAILROOM_VERSION=${MAILROOM_VERSION} /scripts/install-dependencies && rm /scripts/install-dependencies
-CMD /scripts/process-wrapper
+CMD /usr/bin/mail_room -c /var/opt/gitlab/mail_room.yml

gitlab-mailroom/Dockerfile.ubi8

@@ -39,13 +39,10 @@ COPY --from=builder /usr/bin/mail_room /usr/bin/mail_room
 COPY scripts/ /scripts/
 
 RUN dnf --disableplugin=subscription-manager install -yb --nodocs procps libicu tzdata \
-    && adduser -m ${GITLAB_USER} \
-    && mkdir /var/log/gitlab \
-    && touch /var/log/gitlab/mail_room.log \
-    && chown -R ${GITLAB_USER}:${GITLAB_USER} /var/log/gitlab
+    && adduser -m ${GITLAB_USER}
 
 USER ${GITLAB_USER}:${GITLAB_USER}
 
-CMD /scripts/process-wrapper
+CMD /usr/bin/mail_room -c /var/opt/gitlab/mail_room.yml
 
 HEALTHCHECK --interval=30s --timeout=30s --retries=5 CMD /scripts/healthcheck

gitlab-mailroom/scripts/process-wrapper

-#!/bin/bash
-
-set -e
-
-echo "Starting Mailroom"
-/usr/bin/mail_room -c /var/opt/gitlab/mail_room.yml >> /var/log/gitlab/mail_room.log 2>&1 &
-
-tail -f /var/log/gitlab/*
-
-wait