Browse Source

enable ENV

Владимир Томишинец 5 years ago
parent
commit
c1fb412508
1 changed files with 9 additions and 5 deletions
  1. 9 5
      docker-entrypoint.sh

+ 9 - 5
docker-entrypoint.sh

@@ -17,12 +17,16 @@ while [ $? -ne 0 ]; do
 done
 done
 
 
 # See Redmine 108967
 # See Redmine 108967
-admin_ip=$(dig tasks.${ADMIN_HOST}.${APPNET} +short)
-echo ${admin_ip} > /tmp/admin_ip
+ADMIN_IP=$(dig tasks.${ADMIN_HOST}.${APPNET} +short)
+NODE_IP=$(dig ${HOSTNAME}.${APPNET} +short)
+echo ${ADMIN_IP} > /tmp/admin_ip
 
 
-sed -i "s/DB_CLUSTER/\"${DB_CLUSTER}\"/" /etc/web-laboratory/application.conf
-sed -i "s/ADMIN_HOST/$(dig tasks.${ADMIN_HOST}.${APPNET} +short)/" /etc/web-laboratory/application.conf
-sed -i "s/NODE_HOST/$(dig ${HOSTNAME}.${APPNET} +short)/" /etc/web-laboratory/application.conf
+export ${ADMIN_IP}
+export ${NODE_IP}
+
+#sed -i "s/DB_CLUSTER/\"${DB_CLUSTER}\"/" /etc/web-laboratory/application.conf
+#sed -i "s/ADMIN_HOST/$(dig tasks.${ADMIN_HOST}.${APPNET} +short)/" /etc/web-laboratory/application.conf
+#sed -i "s/NODE_HOST/$(dig ${HOSTNAME}.${APPNET} +short)/" /etc/web-laboratory/application.conf
 
 
 # Добавлено логирование для manager memcached. Redmine 107228
 # Добавлено логирование для manager memcached. Redmine 107228
 echo "de.javakaffee.web.msm.level = ${DEBUG}" >> /opt/tomcat/conf/logging.properties
 echo "de.javakaffee.web.msm.level = ${DEBUG}" >> /opt/tomcat/conf/logging.properties