From 94c5f51c4a38422489f0f629d43958b282600111 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 29 Jan 2014 13:13:32 -0700 Subject: [PATCH] Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5cee5e67d0..8dbcee763e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,6 +81,9 @@ RUN gem install --no-rdoc --no-ri fpm --version 1.0.2 # Setup s3cmd config RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg +# Set user.email so crosbymichael's in-container merge commits go smoothly +RUN git config --global user.email 'docker-dummy@example.com' + VOLUME /var/lib/docker WORKDIR /go/src/github.com/dotcloud/docker