From 929b0d9b29b91be70f9284eb43383ce416f26f6c Mon Sep 17 00:00:00 2001 From: Joe Clarke Date: Sun, 18 Feb 2024 11:02:51 -0500 Subject: [PATCH] Use rebase for all pulls. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 31baf492..7acf3c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,6 +66,9 @@ WORKDIR $VIRTUAL_ENV # Apply cron job RUN crontab /etc/cron.d/yang-cron +# Enforce rebase pulls +RUN /usr/bin/git config --global pull.rebase true + USER root:root CMD cron && service postfix start && service rsyslog start && /backend/bin/gunicorn api.wsgi:application -c gunicorn.conf.py