瀏覽代碼

Make AKKA run

Vadim Surkov 6 年之前
父節點
當前提交
90cbcc80a3
共有 3 個文件被更改,包括 10 次插入9 次删除
  1. 3 2
      Dockerfile
  2. 6 6
      docker-entrypoint.sh
  3. 1 1
      healthcheck.sh

+ 3 - 2
Dockerfile

@@ -4,7 +4,7 @@ COPY docker-entrypoint.sh \
      updatedb.sh \
      healthcheck.sh \
      /opt/
-COPY mongodb-org-3.6.repo /etc/yum.repos.d/
+# COPY mongodb-org-3.6.repo /etc/yum.repos.d/
 ENV CATALINA_HOME="/opt/tomcat" 
 ENV PATH=$CATALINA_HOME/bin:$PATH \
     CATALINA_OPTS="-Dconfig.file=/etc/web-laboratory-admin/application.conf" \
@@ -29,7 +29,6 @@ RUN set -x \
            && yum install iputils -y \
            && yum install telnet -y \
            && yum install web-laboratory-admin -y \
-           && yum install mongodb-org-shell -y \
            && yum install nc -y \
            && yum clean all \
            && chmod +x /opt/docker-entrypoint.sh \
@@ -38,5 +37,7 @@ RUN set -x \
            && cd /opt/tomcat/conf/web-laboratory-admin/localhost \
            && ln -s /etc/web-laboratory-admin/ROOT.xml ROOT.xml
 
+#           && yum install mongodb-org-shell -y \
+
 USER tomcat
 CMD ["catalina.sh", "run"]

+ 6 - 6
docker-entrypoint.sh

@@ -15,13 +15,13 @@ if [ "$DB_CLUSTER" ]; then
    sed -i "s/192.168.201.12:27017/${DB_CLUSTER}/" /etc/web-laboratory-admin/application.conf
 fi
 
-sed -i "s/192\.168\.201\.13/${HOSTNAME}.${APPNET}/" /etc/web-laboratory-admin/application.conf
+sed -i "s/192\.168\.201\.13/$(nslookup ${HOSTNAME}.${APPNET} | grep Address | tail -n1 | cut -f2 -d' ')/" /etc/web-laboratory-admin/application.conf
 
-if [ -n  ${CREATE_DATASOURCE} ] && [ ${CREATE_DATASOURCE} == "yes" ]
-then
-  while [ $(nc -w 2 mongodb 27017; echo $?) -ne 0 ]; do echo "Go to sleep"; sleep 2;done
-  /opt/updatedb.sh
-fi
+#if [ -n  ${CREATE_DATASOURCE} ] && [ ${CREATE_DATASOURCE} == "yes" ]
+#then
+#  while [ $(nc -w 2 mongodb 27017; echo $?) -ne 0 ]; do echo "Go to sleep"; sleep 2;done
+#  /opt/updatedb.sh
+#fi
 
 
 exec "$@"

+ 1 - 1
healthcheck.sh

@@ -2,7 +2,7 @@
 
 containerstart=`stat -c %Z /proc/1`
 curtime=`date +%s`
-if [[ $(($containerstart-$curtime)) -le "180" ]]; then
+if (( curtime-containerstart < 180 )); then
     echo "0"
     exit 0
 fi