From 248c35e690661d270dbd8d1f8960d45be474a3c9 Mon Sep 17 00:00:00 2001
From: Roman Prykhodchenko <roman.prykhodchenko@allegro.pl>
Date: Fri, 24 May 2019 14:11:45 +0200
Subject: [PATCH] Use git author for Debian changelog

---
 Makefile                          | 11 ++++++++---
 docker/Dockerfile-deb             |  8 +++++++-
 scripts/generate_deb_changelog.sh |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 82c0565ae2..e3ec215789 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,12 @@ DOCKER_REPO_NAME?="allegro"
 # commits it and tags the created commit with the appropriate snapshot version.
 release-new-version: new_version = $(shell ./get_version.sh generate)
 release-new-version:
-	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
+	docker build \
+		--force-rm \
+		-f docker/Dockerfile-deb \
+		--build-arg GIT_USER_NAME="$(shell git config user.name)" \
+		--build-arg GIT_USER_EMAIL="$(shell git config user.email)" \
+		-t ralph-deb:latest .
 	docker run --rm -it -v $(shell pwd):/volume ralph-deb:latest release-new-version
 	docker image rm --force ralph-deb:latest
 	git add debian/changelog
@@ -19,14 +24,14 @@ release-new-version:
 # build-package builds a release version of the package using the generated
 # changelog and the tag.
 build-package:
-	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
+	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb:latest .
 	docker run --rm -v $(shell pwd):/volume ralph-deb:latest build-package
 	docker image rm --force ralph-deb:latest
 
 # build-snapshot-package renerates a snapshot changelog and uses it to build
 # snapshot version of the package. It is mainly used for testing.
 build-snapshot-package:
-	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
+	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb:latest .
 	docker run --rm -v $(shell pwd):/volume ralph-deb:latest build-snapshot-package
 	docker image rm --force ralph-deb:latest
 
diff --git a/docker/Dockerfile-deb b/docker/Dockerfile-deb
index 0b8b90b705..c731fd2c6a 100644
--- a/docker/Dockerfile-deb
+++ b/docker/Dockerfile-deb
@@ -4,6 +4,9 @@ LABEL maintainer="Allegro.pl Sp. z o.o. opensource@allegro.pl"
 LABEL authors="Allegro.pl Sp. z o.o. and Contributors opensource@allegro.pl"
 LABEL description="Helper image to build deb package for Ralph."
 
+ARG GIT_USER_NAME='root'
+ARG GIT_USER_EMAIL='root@localhost'
+
 ENV DEBIAN_FRONTEND=noninteractive
 ENV SHELL=/bin/bash
 ENV TERM=xterm
@@ -13,7 +16,10 @@ ENV RALPH_DIR=/opt/ralph
 RUN apt-get update && \
     apt-get -y install build-essential debhelper devscripts equivs dh-virtualenv \
     git libmysqlclient-dev python3 python3-dev libffi-dev nodejs npm git-buildpackage \
-    vim-tiny
+    vim-tiny && \
+    rm -rf /var/lib/apt/lists/* && \
+    git config --global user.name "$GIT_USER_NAME" && \
+    git config --global user.email "$GIT_USER_EMAIL"
 
 COPY . $RALPH_DIR
 
diff --git a/scripts/generate_deb_changelog.sh b/scripts/generate_deb_changelog.sh
index 63bd863320..11fa611326 100755
--- a/scripts/generate_deb_changelog.sh
+++ b/scripts/generate_deb_changelog.sh
@@ -18,4 +18,4 @@ else
 fi
 
 echo ${VERSION}
-gbp dch --ignore-branch --spawn-editor=release --new-version "${VERSION}" ${VERSION_PARAMS}
+gbp dch --ignore-branch --git-author --spawn-editor=release --new-version "${VERSION}" ${VERSION_PARAMS}