ehlxr/did
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rm ignore file

Browse Source
This commit is contained in:
ehlxr 2018-08-15 11:39:35 +08:00
parent b130bb63b8
commit 414f9aa3fc
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
did.iml did.iml
**/target/ **/target/
**/dependency-reduced-pom.xml **/dependency-reduced-pom.xml
did-server/docker did-server/_build.sh

3
did-sdk/src/test/java/cn/ceres/did/DidSdkTest.java
View File

@ -17,7 +17,8 @@ public class DidSdkTest {
@Test @Test
public void didSdkTest() throws Exception { public void didSdkTest() throws Exception {
SdkClient client = new SdkClient("10.19.248.200", 30581); // SdkClient client = new SdkClient("10.19.248.200", 30581);
SdkClient client = new SdkClient();
client.init(); client.init();
client.start(); client.start();

16
did-server/Dockerfile
View File

@ -1,16 +0,0 @@
FROM anapsix/alpine-java:latest
MAINTAINER ehlxr <ehlxr.me@gmail.com>
WORKDIR /opt
ARG SERVER_NAME
ENV SERVER_NAME=${SERVER_NAME}
COPY start.sh /opt/start.sh
COPY ${SERVER_NAME}*.jar /opt/
RUN chmod -R 755 /opt/
EXPOSE 16830 16831
ENTRYPOINT ["/opt/start.sh"]

33
did-server/_build.sh Executable file
View File

@ -0,0 +1,33 @@
#!/bin/sh
echo "############## start ##############"
BUILD_DATE=`date +%Y-%m-%d:%H:%M:%S`
#cd ../
SERVER_NAME=`awk '/<name>[^<]+<\/name>/{gsub(/<name>|<\/name>/,"",$1);print $1;exit;}' pom.xml`
#SERVER_NAME=$(basename `pwd`)
mvn clean install -DskipTests
cp target/${SERVER_NAME}*.jar ./docker
cd docker
err=$?
echo "############## $err ##############"
if [ "$err" -ne "0" ]; then
echo "############## build error ! ##############"
exit 1
fi
base_url=10.19.248.200:30100
docker_url=${base_url}/ceres/${SERVER_NAME}:latest
docker build --build-arg SERVER_NAME=${SERVER_NAME} -f ./Dockerfile -t ${docker_url} .
#echo "docker login -u ggov ${base_url}"
docker login -u ggov -p !qaz2wsX ${base_url}
docker push ${docker_url}
rm ${SERVER_NAME}*.jar
echo "build & push finish ..."
echo "############## ${BUILD_DATE} ##############"

3
did-server/build.sh
View File

@ -6,7 +6,8 @@ BUILD_DATE=`date +%Y-%m-%d:%H:%M:%S`
SERVER_NAME=`awk '/<name>[^<]+<\/name>/{gsub(/<name>|<\/name>/,"",$1);print $1;exit;}' pom.xml` SERVER_NAME=`awk '/<name>[^<]+<\/name>/{gsub(/<name>|<\/name>/,"",$1);print $1;exit;}' pom.xml`
#SERVER_NAME=$(basename `pwd`) #SERVER_NAME=$(basename `pwd`)
mvn clean install -DskipTests mvn clean install -DskipTests
cp target/${SERVER_NAME}*.jar . cp target/${SERVER_NAME}*.jar ./docker
cd docker
err=$? err=$?
echo "############## $err ##############" echo "############## $err ##############"

19
did-server/start.sh
View File

@ -1,19 +0,0 @@
#!/bin/sh
#HOSTNAME=`hostname | cut -c1-18`
LOGS_DIR="/data/logs"
if [ ! -d ${LOGS_DIR} ]; then
mkdir -p ${LOGS_DIR}
fi
STDOUT_FILE=${LOGS_DIR}/${SERVER_NAME}.log
JAVA_OPTS=" -Duser.timezone=\"Asia/Shanghai\" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF8"
JAVA_MEM_OPTS=" -server -Xmx${XMX:-512m} -Xms${XMS:-128m} -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC \
-XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=${LargePageSize:-4m} \
-XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
echo "Starting the ${SERVER_NAME} ...\c"
#java -jar ${JAVA_OPTS} ${JAVA_MEM_OPTS} ./${SERVER_NAME}-*.jar > ${STDOUT_FILE} 2>&1
java -jar ${JAVA_OPTS} ${JAVA_MEM_OPTS} ./${SERVER_NAME}-*.jar | tee -a ${STDOUT_FILE} 2>&1