Repository: james-project Updated Branches: refs/heads/master cf2febf0c -> 642555e72
JAMES-2587 update Dockerfiles and package.sh for cassandra-rabbit Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/694489f8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/694489f8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/694489f8 Branch: refs/heads/master Commit: 694489f829a1063ecca7dcf0cb5fd80d7dd1272f Parents: 546d63f Author: tran tien duc <dt...@linagora.com> Authored: Fri Nov 9 14:09:14 2018 +0700 Committer: tran tien duc <dt...@linagora.com> Committed: Fri Nov 9 14:09:14 2018 +0700 ---------------------------------------------------------------------- dockerfiles/packaging/guice/cassandra/Dockerfile | 4 ++++ dockerfiles/packaging/guice/cassandra/package.sh | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/694489f8/dockerfiles/packaging/guice/cassandra/Dockerfile ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/Dockerfile b/dockerfiles/packaging/guice/cassandra/Dockerfile index e9e416d..fc488c3 100644 --- a/dockerfiles/packaging/guice/cassandra/Dockerfile +++ b/dockerfiles/packaging/guice/cassandra/Dockerfile @@ -1,8 +1,10 @@ ARG BASE=linagora/james-project ARG BASE_LDAP=linagora/james-ldap-project +ARG BASE_RABBITMQ=linagora/james-rabbitmq-project ARG TAG=latest FROM ${BASE}:${TAG} as source FROM ${BASE_LDAP}:${TAG} as sourceLdap +FROM ${BASE_RABBITMQ}:${TAG} as sourceRabbitMQ FROM debian:8.11 @@ -17,8 +19,10 @@ COPY scripts/james.service /packages/package/usr/share/james/ COPY --from=source /root/james-server.jar /packages/package/usr/share/james/james-withoutldap-server.jar COPY --from=source /root/james-cli.jar /packages/package/usr/share/james/james-cli.jar COPY --from=sourceLdap /root/james-server.jar /packages/package/usr/share/james/james-ldap-server.jar +COPY --from=sourceRabbitMQ /root/james-server.jar /packages/package/usr/share/james/james-rabbitmq-withoutldap-server.jar COPY --from=source /root/james-server-cassandra-guice.lib/ /packages/package/usr/share/james/james-server-cassandra-guice.lib/ COPY --from=sourceLdap /root/james-server-cassandra-ldap-guice.lib/ /packages/package/usr/share/james/james-server-cassandra-ldap-guice.lib/ +COPY --from=sourceRabbitMQ /root/james-server-cassandra-rabbitmq-guice.lib/ /packages/package/usr/share/james/james-server-cassandra-rabbitmq-guice.lib/ COPY --from=source /root/james-server-cli.lib/ /packages/package/usr/share/james/james-server-cli.lib/ RUN mkdir -p /packages/package/var/lib/james http://git-wip-us.apache.org/repos/asf/james-project/blob/694489f8/dockerfiles/packaging/guice/cassandra/package.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/package.sh b/dockerfiles/packaging/guice/cassandra/package.sh index 2e58d01..4836dd5 100644 --- a/dockerfiles/packaging/guice/cassandra/package.sh +++ b/dockerfiles/packaging/guice/cassandra/package.sh @@ -20,8 +20,10 @@ ITERATION=$2 SHA1=$3 DIRECTORY=$4 -# Compile James +# Build Compiler environment docker build -t james/project dockerfiles/compilation/java-8 + +# Compile James with Cassandra docker run \ --rm \ --volume $PWD/.m2:/root/.m2 \ @@ -35,15 +37,27 @@ docker run \ --volume $PWD/dockerfiles/run/guice/cassandra-ldap/destination:/cassandra/destination \ -t james/project -s $SHA1 -# Build image +# Compile James with Cassandra + RabbitMQ +docker run \ + --rm \ + --volume $PWD/.m2:/root/.m2 \ + --volume $PWD:/origin \ + --volume $PWD/dockerfiles/run/guice/cassandra-rabbitmq/destination:/cassandra-rabbitmq/destination \ + -t james/project -s $SHA1 + +# Build image James with Cassandra docker build -t james_run dockerfiles/run/guice/cassandra docker build -t james_run_ldap dockerfiles/run/guice/cassandra-ldap +# Build image James with Cassandra + RabbitMQ +docker build -t james_rabbitmq_run dockerfiles/run/guice/cassandra-rabbitmq + # Build packages docker build -t build-james-packages \ --build-arg RELEASE=$RELEASE-$SHA1 \ --build-arg ITERATION=$ITERATION \ --build-arg BASE=james_run \ --build-arg BASE_LDAP=james_run_ldap \ + --build-arg BASE_RABBITMQ=james_rabbitmq_run \ dockerfiles/packaging/guice/cassandra docker run --rm --name james-packages -v $DIRECTORY:/result build-james-packages --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
