Skip to content

Commit 248c35e

Browse files
committedMay 24, 2019
Use git author for Debian changelog
1 parent 6c01721 commit 248c35e

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed
 

‎Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ DOCKER_REPO_NAME?="allegro"
99
# commits it and tags the created commit with the appropriate snapshot version.
1010
release-new-version: new_version = $(shell ./get_version.sh generate)
1111
release-new-version:
12-
docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
12+
docker build \
13+
--force-rm \
14+
-f docker/Dockerfile-deb \
15+
--build-arg GIT_USER_NAME="$(shell git config user.name)" \
16+
--build-arg GIT_USER_EMAIL="$(shell git config user.email)" \
17+
-t ralph-deb:latest .
1318
docker run --rm -it -v $(shell pwd):/volume ralph-deb:latest release-new-version
1419
docker image rm --force ralph-deb:latest
1520
git add debian/changelog
@@ -19,14 +24,14 @@ release-new-version:
1924
# build-package builds a release version of the package using the generated
2025
# changelog and the tag.
2126
build-package:
22-
docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
27+
docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb:latest .
2328
docker run --rm -v $(shell pwd):/volume ralph-deb:latest build-package
2429
docker image rm --force ralph-deb:latest
2530

2631
# build-snapshot-package renerates a snapshot changelog and uses it to build
2732
# snapshot version of the package. It is mainly used for testing.
2833
build-snapshot-package:
29-
docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
34+
docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb:latest .
3035
docker run --rm -v $(shell pwd):/volume ralph-deb:latest build-snapshot-package
3136
docker image rm --force ralph-deb:latest
3237

‎docker/Dockerfile-deb

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ LABEL maintainer="Allegro.pl Sp. z o.o. opensource@allegro.pl"
44
LABEL authors="Allegro.pl Sp. z o.o. and Contributors opensource@allegro.pl"
55
LABEL description="Helper image to build deb package for Ralph."
66

7+
ARG GIT_USER_NAME='root'
8+
ARG GIT_USER_EMAIL='root@localhost'
9+
710
ENV DEBIAN_FRONTEND=noninteractive
811
ENV SHELL=/bin/bash
912
ENV TERM=xterm
@@ -13,7 +16,10 @@ ENV RALPH_DIR=/opt/ralph
1316
RUN apt-get update && \
1417
apt-get -y install build-essential debhelper devscripts equivs dh-virtualenv \
1518
git libmysqlclient-dev python3 python3-dev libffi-dev nodejs npm git-buildpackage \
16-
vim-tiny
19+
vim-tiny && \
20+
rm -rf /var/lib/apt/lists/* && \
21+
git config --global user.name "$GIT_USER_NAME" && \
22+
git config --global user.email "$GIT_USER_EMAIL"
1723

1824
COPY . $RALPH_DIR
1925

‎scripts/generate_deb_changelog.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ else
1818
fi
1919

2020
echo ${VERSION}
21-
gbp dch --ignore-branch --spawn-editor=release --new-version "${VERSION}" ${VERSION_PARAMS}
21+
gbp dch --ignore-branch --git-author --spawn-editor=release --new-version "${VERSION}" ${VERSION_PARAMS}

0 commit comments

Comments
 (0)
Please sign in to comment.