Browse Source

Enable env, delete if;then;fi, add --entrypoint=\"\"

tomishinets.v 6 năm trước cách đây
mục cha
commit
7af4896f49
3 tập tin đã thay đổi với 11 bổ sung12 xóa
  1. 2 2
      Dockerfile
  2. 1 1
      Jenkinsfile
  3. 8 9
      docker-entrypoint.sh

+ 2 - 2
Dockerfile

@@ -15,8 +15,8 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     MONGODB=laboratory \
     FB_HOST=fb3_demo \
     FB_DATABASE=lab_99001 \
-    REPORT_SERVER_URL=http://reportproxy4.infoclinica.lan
-#    APPNET=labnetwork
+    REPORT_SERVER_URL=http://reportproxy4.infoclinica.lan \
+    APPNET=labnetwork
 EXPOSE 8091 8080 8009 2551
 HEALTHCHECK --start-period=300s --interval=15s --timeout=5s --retries=2 CMD /opt/healthcheck.sh
 ARG repo=prod

+ 1 - 1
Jenkinsfile

@@ -43,7 +43,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"
         }

+ 8 - 9
docker-entrypoint.sh

@@ -1,13 +1,12 @@
 #!/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
-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
 
 /opt/updatedb.sh