Author: matthieu
Date: Mon Oct 26 15:16:27 2015
New Revision: 1710625
URL: http://svn.apache.org/viewvc?rev=1710625&view=rev
Log:
JAMES-1628 Provide docker environment merging a SHA1 on trunk
Contributed by Antoine Duprat and Raphael Ouazana
Added:
james/project/trunk/dockerfiles/merge/
james/project/trunk/dockerfiles/merge/Dockerfile
james/project/trunk/dockerfiles/merge/merge.sh (with props)
Modified:
james/project/trunk/README.txt
Modified: james/project/trunk/README.txt
URL:
http://svn.apache.org/viewvc/james/project/trunk/README.txt?rev=1710625&r1=1710624&r2=1710625&view=diff
==============================================================================
--- james/project/trunk/README.txt (original)
+++ james/project/trunk/README.txt Mon Oct 26 15:16:27 2015
@@ -181,3 +181,17 @@ Where :
- JAMES_IP: IP address or DNS entry for your James server
- JAMES_PORT: Port allocated to James' IMAP port (should be 143).
- SHA1(optional): Branch to use in order to build integration tests or trunk
+
+
+Howto check the merge of a commit
+=================================
+
+First step, you have to build the Docker image
+$ docker build -t james/merge dockerfiles/merge
+
+In order to run the build, you have to launch the following command:
+$ docker run -v $PWD:/origin -t james/merge SHA1 RESULTING_BRANCH
+
+Where :
+- SHA1: is the given git SHA1 of the james-project repository to merge.
+- RESULTING_BRANCH: is the branch created when merging.
Added: james/project/trunk/dockerfiles/merge/Dockerfile
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/merge/Dockerfile?rev=1710625&view=auto
==============================================================================
--- james/project/trunk/dockerfiles/merge/Dockerfile (added)
+++ james/project/trunk/dockerfiles/merge/Dockerfile Mon Oct 26 15:16:27 2015
@@ -0,0 +1,14 @@
+FROM debian:8.1
+
+ENV GIT_VERSION 1:2.1.4-2.1
+
+RUN apt-get update
+RUN apt-get install -y git="$GIT_VERSION"
+
+RUN git config --global user.email \"merge@localhost\" \
+ && git config --global user.name \"Merge\"
+
+ADD . /origin
+WORKDIR /origin
+
+ENTRYPOINT ["/origin/dockerfiles/merge/merge.sh"]
Added: james/project/trunk/dockerfiles/merge/merge.sh
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/merge/merge.sh?rev=1710625&view=auto
==============================================================================
--- james/project/trunk/dockerfiles/merge/merge.sh (added)
+++ james/project/trunk/dockerfiles/merge/merge.sh Mon Oct 26 15:16:27 2015
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+printUsage() {
+ echo "Usage : "
+ echo "./merge.sh SHA1 RESULTING_BRANCH"
+ echo " SHA1: SHA1 to merge with trunk"
+ echo " RESULTING_BRANCH : Resulting branch of the merge"
+ exit 1
+}
+
+if [ "$#" -ne 2 ]; then
+ printUsage
+fi
+
+SHA1=$1
+RESULTING_BRANCH=$2
+
+git fetch origin
+git checkout trunk
+git checkout $SHA1 -b SHA1_BRANCH
+git checkout trunk
+git checkout -b $RESULTING_BRANCH
+git merge --no-edit SHA1_BRANCH
Propchange: james/project/trunk/dockerfiles/merge/merge.sh
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
