eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-15 10:18:45 +00:00
Code Activity

using new generateMailProperties.sh to support "start docker"

Browse Source
This commit is contained in:
Axel Uhl
2024-12-05 13:37:44 +01:00
parent e55aa04cd0
commit 328a866498
7 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration/buildAndUpdateProduct.sh
+3
View File
@@ -299,6 +299,7 @@ if [[ "$@" == "release" ]]; then
cp -v $PROJECT_HOME/java/target/configuration/JavaSE-11.profile $ACDIR/
cp -v $PROJECT_HOME/java/target/refreshInstance.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/stopReplicating.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/generateMailProperties.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/env-default-rules.sh $ACDIR/
@@ -860,6 +861,7 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
cp -v $PROJECT_HOME/java/target/configuration/JavaSE-11.profile $ACDIR/
cp -v $PROJECT_HOME/java/target/refreshInstance.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/stopReplicating.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/generateMailProperties.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/
cp -v $PROJECT_HOME/java/target/http2udpmirror $ACDIR
@@ -967,6 +969,7 @@ if [[ "$@" == "remote-deploy" ]]; then
$SCP_CMD $PROJECT_HOME/java/target/status $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
$SCP_CMD $PROJECT_HOME/java/target/refreshInstance.sh $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
$SCP_CMD $PROJECT_HOME/java/target/stopReplicating.sh $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
$SCP_CMD $PROJECT_HOME/java/target/generateMailProperties.sh $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
$SCP_CMD $PROJECT_HOME/java/target/udpmirror $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
$SCP_CMD $PROJECT_HOME/java/target/http2udpmirror $REMOTE_SERVER_LOGIN:$REMOTE_SERVER/
configuration/environments_scripts/sailing_server/files/usr/local/bin/refreshInstance.sh
+1 -20
View File
@@ -296,26 +296,7 @@ auto_install ()
append_default_envsh_rules
# make sure to reload data, this time including defaults from release's env.sh, environment settings and user data
source `pwd`/env.sh
# Append mail-related environment variables to configuration/mail.properties to override defaults
echo "mail.enabled = true" >>configuration/mail.properties
if [ -n "$MAIL_FROM" ]; then
echo "mail.from = $MAIL_FROM" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_HOST" ]; then
echo "mail.smtp.host = $MAIL_SMTP_HOST" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_PORT" ]; then
echo "mail.smtp.port = $MAIL_SMTP_PORT" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_AUTH" ]; then
echo "mail.smtp.auth = $MAIL_SMTP_AUTH" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_USER" ]; then
echo "mail.smtp.user = $MAIL_SMTP_USER" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_PASSWORD" ]; then
echo "mail.smtp.password = $MAIL_SMTP_PASSWORD" >>configuration/mail.properties
fi
. generateMailProperties.sh
echo ""
echo "INSTALL_FROM_RELEASE: $INSTALL_FROM_RELEASE"
echo "DEPLOY_TO: $DEPLOY_TO"
docker/Dockerfile
+1 -1
View File
@@ -24,4 +24,4 @@ RUN cat env-default-rules.sh >>env.sh
COPY start .
COPY JavaSE-11.profile .
EXPOSE 8888 14888 8000 7091 6666
CMD [ "/home/sailing/servers/server/start", "fg" ]
CMD [ "/home/sailing/servers/server/start", "docker" ]
docker/Dockerfile_sapsailing_on_sapmachine11
+1 -1
View File
@@ -22,4 +22,4 @@ RUN cat env-default-rules.sh >>env.sh
COPY start .
COPY JavaSE-11.profile .
EXPOSE 8888 14888 8000 7091 6666
CMD [ "/home/sailing/servers/server/start", "fg" ]
CMD [ "/home/sailing/servers/server/start", "docker" ]
docker/Dockerfile_sapsailing_on_sapmachine17
+1 -1
View File
@@ -22,4 +22,4 @@ RUN cat env-default-rules.sh >>env.sh
COPY start .
COPY JavaSE-11.profile .
EXPOSE 8888 14888 8000 7091 6666
CMD [ "/home/sailing/servers/server/start", "fg" ]
CMD [ "/home/sailing/servers/server/start", "docker" ]
java/target/generateMailProperties.sh
+22
View File
@@ -0,0 +1,22 @@
#!/bin/bash
# Append mail-related environment variables to configuration/mail.properties to override defaults
echo "mail.enabled = true" >>configuration/mail.properties
if [ -n "$MAIL_FROM" ]; then
echo "mail.from = $MAIL_FROM" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_HOST" ]; then
echo "mail.smtp.host = $MAIL_SMTP_HOST" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_PORT" ]; then
echo "mail.smtp.port = $MAIL_SMTP_PORT" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_AUTH" ]; then
echo "mail.smtp.auth = $MAIL_SMTP_AUTH" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_USER" ]; then
echo "mail.smtp.user = $MAIL_SMTP_USER" >>configuration/mail.properties
fi
if [ -n "$MAIL_SMTP_PASSWORD" ]; then
echo "mail.smtp.password = $MAIL_SMTP_PASSWORD" >>configuration/mail.properties
fi
java/target/start
+3
View File
@@ -150,6 +150,9 @@ elif [[ $PARAM == "debug" ]]; then
"$JAVA_BINARY" -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=*:8000,suspend=y $JFR_OPTIONS ${COMMON_JAVA_ARGS}
elif [[ $PARAM == "fg" ]]; then
exec "$JAVA_BINARY" ${COMMON_JAVA_ARGS}
elif [[ $PARAM == "docker" ]]; then
. generateMailProperties.sh
exec "$JAVA_BINARY" ${COMMON_JAVA_ARGS}
fi