JAMES-2598 Update script packaging
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/51007020 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/51007020 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/51007020 Branch: refs/heads/master Commit: 5100702082da44ea593cc1b5bf4b1379d0563811 Parents: 00964ee Author: datph <dphamho...@linagora.com> Authored: Mon Nov 26 13:11:04 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Wed Nov 28 17:18:55 2018 +0700 ---------------------------------------------------------------------- .../packaging/guice/cassandra/package.sh | 21 +------------------- .../guice/cassandra/scripts/james.postinst | 1 + .../guice/cassandra/scripts/james.postremove | 1 + .../guice/cassandra/scripts/james.rpm.postinst | 3 ++- .../cassandra/scripts/james.rpm.postremove | 2 ++ 5 files changed, 7 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/51007020/dockerfiles/packaging/guice/cassandra/package.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/package.sh b/dockerfiles/packaging/guice/cassandra/package.sh index 77a7722..908a0ac 100644 --- a/dockerfiles/packaging/guice/cassandra/package.sh +++ b/dockerfiles/packaging/guice/cassandra/package.sh @@ -23,33 +23,14 @@ DIRECTORY=$4 # Build Compiler environment docker build -t james/project dockerfiles/compilation/java-8 -# Compile James with Cassandra +# Compile James docker run \ --rm \ --volume $PWD/.m2:/root/.m2 \ --volume $PWD:/origin \ --volume $PWD/dockerfiles/run/guice/cassandra/destination:/cassandra/destination \ - -t james/project -s $SHA1 -docker run \ - --rm \ - --volume $PWD/.m2:/root/.m2 \ - --volume $PWD:/origin \ --volume $PWD/dockerfiles/run/guice/cassandra-ldap/destination:/cassandra/destination \ - -t james/project -s $SHA1 - -# Compile James with Cassandra + RabbitMQ + Swift BlobStore -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 - -# 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 http://git-wip-us.apache.org/repos/asf/james-project/blob/51007020/dockerfiles/packaging/guice/cassandra/scripts/james.postinst ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.postinst b/dockerfiles/packaging/guice/cassandra/scripts/james.postinst index a03cd9c..a522328 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.postinst +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.postinst @@ -5,6 +5,7 @@ ln -s /etc/james /var/lib/james/conf update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-ldap-server.jar 10 update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-withoutldap-server.jar 20 update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-withoutldap-server.jar 30 +update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-ldap-server.jar 40 systemctl enable james http://git-wip-us.apache.org/repos/asf/james-project/blob/51007020/dockerfiles/packaging/guice/cassandra/scripts/james.postremove ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.postremove b/dockerfiles/packaging/guice/cassandra/scripts/james.postremove index bde6eb2..af63d94 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.postremove +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.postremove @@ -3,3 +3,4 @@ update-alternatives --remove james /usr/share/james/james-ldap-server.jar update-alternatives --remove james /usr/share/james/james-withoutldap-server.jar update-alternatives --remove james /usr/share/james/james-rabbitmq-withoutldap-server.jar +update-alternatives --remove james /usr/share/james/james-rabbitmq-ldap-server.jar http://git-wip-us.apache.org/repos/asf/james-project/blob/51007020/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst index 2030e95..9c65baf 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst @@ -4,7 +4,8 @@ ln -s /etc/james /var/lib/james/conf update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-ldap-server.jar 10 update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-withoutldap-server.jar 20 -update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-withoutldap-server.jar 20 +update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-withoutldap-server.jar 30 +update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-rabbitmq-ldap-server.jar 40 #Workaround waiting for https://github.com/jordansissel/fpm/issues/1163 to be released cp /usr/share/james/james.service /etc/systemd/system/ http://git-wip-us.apache.org/repos/asf/james-project/blob/51007020/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove index aede41f..aefd136 100644 --- a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove +++ b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove @@ -8,3 +8,5 @@ rm /etc/systemd/system/james.service update-alternatives --remove james /usr/share/james/james-ldap-server.jar update-alternatives --remove james /usr/share/james/james-withoutldap-server.jar update-alternatives --remove james /usr/share/james/james-rabbitmq-withoutldap-server.jar +update-alternatives --remove james /usr/share/james/james-rabbitmq-ldap-server.jar + --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
