Browse code
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Tianon Gravi authored on 2014/01/30 05:13:32Showing 1 changed files
| ... | ... |
@@ -81,6 +81,9 @@ RUN gem install --no-rdoc --no-ri fpm --version 1.0.2 |
| 81 | 81 |
# Setup s3cmd config |
| 82 | 82 |
RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg |
| 83 | 83 |
|
| 84 |
+# Set user.email so crosbymichael's in-container merge commits go smoothly |
|
| 85 |
+RUN git config --global user.email 'docker-dummy@example.com' |
|
| 86 |
+ |
|
| 84 | 87 |
VOLUME /var/lib/docker |
| 85 | 88 |
WORKDIR /go/src/github.com/dotcloud/docker |
| 86 | 89 |
|