You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/11/28 10:46:37 UTC
[5/9] james-project git commit: JAMES-2598 Packaging
Cassandra-RabbitMQ-Ldap produt with deb/rpm
JAMES-2598 Packaging Cassandra-RabbitMQ-Ldap produt with deb/rpm
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/00964ee7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/00964ee7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/00964ee7
Branch: refs/heads/master
Commit: 00964ee7c677428676196ae89260f56ff196db58
Parents: b78f066
Author: datph <dp...@linagora.com>
Authored: Mon Nov 26 11:31:12 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Nov 28 17:18:40 2018 +0700
----------------------------------------------------------------------
dockerfiles/packaging/guice/cassandra/Dockerfile | 4 ++++
dockerfiles/packaging/guice/cassandra/package.sh | 12 ++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/00964ee7/dockerfiles/packaging/guice/cassandra/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/Dockerfile b/dockerfiles/packaging/guice/cassandra/Dockerfile
index fc488c3..d031fe8 100644
--- a/dockerfiles/packaging/guice/cassandra/Dockerfile
+++ b/dockerfiles/packaging/guice/cassandra/Dockerfile
@@ -1,10 +1,12 @@
ARG BASE=linagora/james-project
ARG BASE_LDAP=linagora/james-ldap-project
ARG BASE_RABBITMQ=linagora/james-rabbitmq-project
+ARG BASE_RABBITMQ_LDAP=linagora/james-rabbitmq-ldap-project
ARG TAG=latest
FROM ${BASE}:${TAG} as source
FROM ${BASE_LDAP}:${TAG} as sourceLdap
FROM ${BASE_RABBITMQ}:${TAG} as sourceRabbitMQ
+FROM ${BASE_RABBITMQ_LDAP}:${TAG} as sourceRabbitMQLdap
FROM debian:8.11
@@ -20,9 +22,11 @@ COPY --from=source /root/james-server.jar /packages/package/usr/share/james/jame
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=sourceRabbitMQLdap /root/james-server.jar /packages/package/usr/share/james/james-rabbitmq-ldap-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=sourceRabbitMQLdap /root/james-server-cassandra-rabbitmq-ldap-guice.lib /packages/package/usr/share/james/james-server-cassandra-rabbitmq-ldap-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/00964ee7/dockerfiles/packaging/guice/cassandra/package.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/package.sh b/dockerfiles/packaging/guice/cassandra/package.sh
index 16bdc4c..77a7722 100644
--- a/dockerfiles/packaging/guice/cassandra/package.sh
+++ b/dockerfiles/packaging/guice/cassandra/package.sh
@@ -45,6 +45,14 @@ docker run \
--volume $PWD/dockerfiles/run/guice/cassandra-rabbitmq/destination:/cassandra-rabbitmq/destination \
-t james/project -s $SHA1
+# Compile James with Cassandra + RabbitMQ + Swift + Ldap
+docker run \
+ --rm \
+ --volume PWD/.m2:/root/.m2 \
+ --volume $PWD:/origin \
+ --volume $PWD/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination:/cassandra-rabbitmq-ldap/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
@@ -52,6 +60,9 @@ 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 image James with Cassandra + RabbitMQ + Ldap
+docker build -t james_rabbitmq_ldap_run dockerfiles/run/guice/cassandra-rabbitmq-ldap
+
# Build packages
docker build -t build-james-packages \
--build-arg RELEASE=$RELEASE-$SHA1 \
@@ -59,5 +70,6 @@ docker build -t build-james-packages \
--build-arg BASE=james_run \
--build-arg BASE_LDAP=james_run_ldap \
--build-arg BASE_RABBITMQ=james_rabbitmq_run \
+ --build-arg BASE_RABBITMQ_LDAP=james_rabbitmq_ldap_run
dockerfiles/packaging/guice/cassandra
docker run --rm --name james-packages -v $DIRECTORY:/result build-james-packages
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org