change build image

Dockerfile

@@ -1,7 +1,6 @@
 FROM jcr.infoclinica.ru/iru/iru-base:7.6
 ENTRYPOINT ["/entrypoint.sh"]
 COPY entrypoint.sh \
-     healthcheck.sh \
      /
 # Change export PATH. See https://github.com/GoogleContainerTools/kaniko/issues/748
 ENV CATALINA_HOME="/opt/tomcat" \
@@ -22,7 +21,7 @@ RUN set -x \
            && yum install -y iputils tomcat-8.0.26-01 \
            && yum install -y web-laboratory \
            && yum clean all \
-           && chmod +x /entrypoint.sh /healthcheck.sh \
+           && chmod +x /entrypoint.sh \
            && curl https://repo1.maven.org/maven2/de/javakaffee/msm/memcached-session-manager/${memcached_version}/memcached-session-manager-${memcached_version}.jar -o /opt/tomcat/lib/memcached-session-manager-${memcached_version}.jar \
            && curl https://repo1.maven.org/maven2/de/javakaffee/msm/memcached-session-manager-tc8/${memcached_version}/memcached-session-manager-tc8-${memcached_version}.jar -o /opt/tomcat/lib/memcached-session-manager-tc8-${memcached_version}.jar \
            && curl https://repo1.maven.org/maven2/net/spy/spymemcached/${spymemcached_version}/spymemcached-${spymemcached_version}.jar -o /opt/tomcat/lib/spymemcached-${spymemcached_version}.jar \

devK8s.Jenkinsfile

@@ -4,6 +4,7 @@ pipeline {
   options {
     buildDiscarder logRotator(numToKeepStr: '10')
     disableConcurrentBuilds()
+    timeout(time: 10, unit: 'MINUTES')
   }
   agent {
     kubernetes {

entrypoint.sh

@@ -1,45 +1,12 @@
 #!/usr/bin/env bash
 
-echo "Initial nslookup ${HOSTNAME}.${APPNET}"
-nslookup ${HOSTNAME}.${APPNET}
-while [ $? -ne 0 ]; do
-  echo "Waiting for ${HOSTNAME}.${APPNET} to become available"
-  sleep 1
-  nslookup ${HOSTNAME}.${APPNET}
-done
-
-echo "Initial nslookup tasks.${ADMIN_HOST}.${APPNET}"
-nslookup tasks.${ADMIN_HOST}.${APPNET}
-while [ $? -ne 0 ]; do
-  echo "Waiting for tasks.${ADMIN_HOST}.${APPNET} to become available"
-  sleep 1
-  nslookup tasks.${ADMIN_HOST}.${APPNET}
-done
-
-# See Redmine 108967
-ADMIN_IP=$(dig tasks.${ADMIN_HOST}.${APPNET} +short)
-NODE_IP=$(dig ${HOSTNAME}.${APPNET} +short)
-echo ${ADMIN_IP} > /tmp/admin_ip
-
-#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
+# Создание символических ссылок
+[ -f /configs/application.conf ] && ln -sf /configs/application.conf /etc/web-laboratory/application.conf
+[ -f /configs/ROOT.xml ] && ln -sf /configs/ROOT.xml /etc/web-laboratory/ROOT.xml
 
 # Добавлено логирование для manager memcached. Redmine 107228
 echo "de.javakaffee.web.msm.level = ${DEBUG}" >> /opt/tomcat/conf/logging.properties
 echo "net.spy.memcached.level = ${DEBUG}" >> /opt/tomcat/conf/logging.properties
 
-# Включение аунтификации по smb протоколу, https://corp.sdsys.ru/trac/sds/ticket/51455
-if [[ ! -z $SMB_USERNAME ]]; then
-  sed -i "s/auth-enable: false/auth-enable: true/" /etc/web-laboratory/application.conf
-  sed -i "s/username: \"\"/username: \"${SMB_USERNAME}\"/" /etc/web-laboratory/application.conf
-  sed -i "s/domain: \"\"/domain: \"${SMB_DOMAIN}\"/" /etc/web-laboratory/application.conf
-  sed -i "s/password: \"\"/password: \"${SMB_PASSWORD}\"/" /etc/web-laboratory/application.conf
-fi
-
 source /etc/init.d/web-laboratory status
-
 exec "$@"

healthcheck.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-containerstart=`stat -c %Z /proc/1`
-curtime=`date +%s`
-if (( curtime-containerstart < 180 )); then
-    while ! mongo --host "${DB_CLUSTER}" --eval "db.runCommand( { connectionStatus: 1 } )"; do echo "Waiting for ${DB_CLUSTER} to be available"; sleep 1; done
-    echo "0"
-    exit 0
-fi
-
-curl -f 127.0.0.1:8090/login || exit 1
-
-# Проверяем наличие файла с переменной time_to_dead
-if [ -f /tmp/dead ];then
-  if (( ${curtime} > $(cat /tmp/dead) ));then kill 1;fi
-else
-# Определяем изменился ли адрес админки
-  ping -c3 $(cat /tmp/admin_ip)
-  if [[ $? -ne 0 ]]; then
-    new_admin_ip=$(dig +short ${ADMIN_HOST}.${APPNET})
-    if [[ ${new_admin_ip} != $(cat /tmp/admin_ip) ]];then
-      ping -c3 ${new_admin_ip} || exit 0
-    fi
-# Вычисляем адреса task'ов и сортируем их
-    sorted=($(echo $(dig tasks.${SERVICE_NAME}.${APPNET} +short)|tr " " "\n"|sort -n))
-    for (( i=0; i < ${#sorted[*]}; i++ ))
-    do
-      [[ $(ip a | grep ${sorted[${i}]}) ]] && echo $((${i}*180+$(date +%s)+40)) > /tmp/dead
-    done
-  fi
-fi
-exit 0

mongodb-org-3.6.repo

@@ -1,6 +0,0 @@
-[mongodb-org-3.6]
-name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.6/x86_64/
-gpgcheck=1
-enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-3.6.asc

prodK8s.Jenkinsfile

@@ -4,6 +4,7 @@ pipeline {
   options {
     buildDiscarder logRotator(numToKeepStr: '10')
     disableConcurrentBuilds()
+    timeout(time: 10, unit: 'MINUTES')
   }
   agent {
     kubernetes {