restore env, delete if;then;fi, add disable entrypoint

Dockerfile

@@ -8,10 +8,10 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     CATALINA_OPTS="-Dconfig.file=/etc/web-laboratory/application.conf" \
     JAVA_HOME=/usr/java/default \
     JAVA_OPTS="-Xms512M -Xmx1024M -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true" \
-    WORKDIR=$CATALINA_HOME
-#    DB_CLUSTER=mongodb \
-#    APPNET=labnetwork \
-#    ADMIN_HOST=admin-lab
+    WORKDIR=$CATALINA_HOME \
+    DB_CLUSTER=mongodb \
+    APPNET=labnetwork \
+    ADMIN_HOST=admin-lab
 EXPOSE 8090 9000 2551
 HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD /tmp/healthcheck.sh
 ARG repo=prod

Jenkinsfile

@@ -46,7 +46,7 @@ pipeline {
         echo "\u001B[32m \u2600 Building \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}. \u001B[0m"
         sh "docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
         script {
-           NEWTAG = sh script: "docker run --rm ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true
+           NEWTAG = sh script: "docker run --rm --entrypoint="" ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true
            NEWTAG = repo + "-" + NEWTAG + "_" + BUILD_NUMBER
            echo "NEWTAG is $NEWTAG"
         }

docker-entrypoint.sh

@@ -1,28 +1,25 @@
 #!/usr/bin/env bash
 
-if [ ! -z "${APPNET}" ]; then
-   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
-fi
+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
 
 sed -i "s/192.168.201.12:27017/${DB_CLUSTER}/" /etc/web-laboratory/application.conf
 sed -i "s/192.168.201.13/$(nslookup tasks.${ADMIN_HOST}.${APPNET} | grep Address | tail -n1 | cut -f2 -d' ')/" /etc/web-laboratory/application.conf
 sed -i "s/192.168.201.23/$(nslookup ${HOSTNAME}.${APPNET} | grep Address | tail -n1 | cut -f2 -d' ')/" /etc/web-laboratory/application.conf
 
-#source /etc/init.d/web-laboratory status
+source /etc/init.d/web-laboratory status
 
 exec "$@"