You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/09/13 08:00:28 UTC
[james-project] 01/02: JAMES-3603 Adapt demo docker file to latest
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a4573f3132f4d0cb7bd3dbdc8733d613103e9573
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Aug 29 19:09:15 2021 +0700
JAMES-3603 Adapt demo docker file to latest
---
server/apps/demo/Dockerfile | 3 +--
server/apps/demo/initialdata.sh | 8 ++++----
server/apps/demo/james-cli | 3 ---
server/apps/demo/startup.sh | 10 +++++++++-
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/server/apps/demo/Dockerfile b/server/apps/demo/Dockerfile
index fc5d8c6..48da482 100644
--- a/server/apps/demo/Dockerfile
+++ b/server/apps/demo/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM apache/james:jpa-3.6.0
+FROM apache/james:jpa-latest
# Install git
RUN apt-get update
@@ -15,7 +15,6 @@ RUN cp /root/wait-for-it/wait-for-it.sh /usr/bin/wait-for-it.sh
COPY startup.sh /root
COPY initialdata.sh /root
-COPY james-cli /usr/local/bin/
RUN chmod +x /root/startup.sh
RUN chmod +x /root/initialdata.sh
diff --git a/server/apps/demo/initialdata.sh b/server/apps/demo/initialdata.sh
index d4b8093..3fa5cba 100644
--- a/server/apps/demo/initialdata.sh
+++ b/server/apps/demo/initialdata.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-java -jar /root/james-cli.jar -h localhost -p 9999 adddomain james.local
+james-cli adddomain james.local
-java -jar /root/james-cli.jar -h localhost -p 9999 adduser user01@james.local 1234
-java -jar /root/james-cli.jar -h localhost -p 9999 adduser user02@james.local 1234
-java -jar /root/james-cli.jar -h localhost -p 9999 adduser user03@james.local 1234
+james-cli adduser user01@james.local 1234
+james-cli adduser user02@james.local 1234
+james-cli adduser user03@james.local 1234
diff --git a/server/apps/demo/james-cli b/server/apps/demo/james-cli
deleted file mode 100755
index 752e29c..0000000
--- a/server/apps/demo/james-cli
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -jar /root/james-cli.jar -h 127.0.0.1 -p 9999 "$@"
\ No newline at end of file
diff --git a/server/apps/demo/startup.sh b/server/apps/demo/startup.sh
index eb86739..2a8510f 100644
--- a/server/apps/demo/startup.sh
+++ b/server/apps/demo/startup.sh
@@ -1,5 +1,13 @@
#!/bin/bash
+if [[ ! -e /root/conf/private.key ]]; then
+ openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj "/C=US/ST=Apache/L=Fundation/O=/CN=james.apache.org" -keyout /root/conf/private.key -out /root/conf/private.csr
+fi
+
wait-for-it.sh --host=localhost --port=9999 --strict --timeout=0 -- ./initialdata.sh &
-java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-jpa-guice.lib/openjpa-3.1.2.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain
\ No newline at end of file
+java -Djdk.tls.ephemeralDHKeySize=2048 \
+ -classpath '/root/resources:/root/classes:/root/libs/*' \
+ -javaagent:/root/libs/openjpa-3.1.2.jar \
+ -Dlogback.configurationFile=/root/conf/logback.xml \
+ -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org