Browse Source

Add updatedb.sh

Admin User 6 years ago
parent
commit
b65f6ef204
4 changed files with 55 additions and 4 deletions
  1. 15 2
      Dockerfile
  2. 9 2
      docker-entrypoint.sh
  3. 6 0
      mongodb-org-3.6.repo
  4. 25 0
      updatedb.sh

+ 15 - 2
Dockerfile

@@ -1,21 +1,34 @@
 FROM registry.sdsys.ru/iru/iru-base:0.1
 ENTRYPOINT ["/opt/docker-entrypoint.sh"]
-COPY docker-entrypoint.sh /opt/docker-entrypoint.sh
+COPY docker-entrypoint.sh \
+     updatedb.sh \
+     /opt/
+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" \
     JAVA_HOME=/usr/java/default \
     JAVA_OPTS="-Xms512M -Xmx1024M -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true" \
     WORKDIR=$CATALINA_HOME \
-    DB_CLUSTER=mongodb
+    DB_CLUSTER=mongodb \
+    MONGOHOST=mongodb \
+    MONGODB=laboratory \
+    HOST=fb3_demo \
+    PORT=3050 \
+    ALIAS=dev_iru_swarm_lab_99001 \
+    REPORT_SERVER_URL=http://reportproxy4.infoclinica.lan
 EXPOSE 8091 8080 8009 2551
 HEALTHCHECK --start-period=300s --interval=15s --timeout=5s --retries=2 CMD curl -f 127.0.0.1:8091/login || exit 1
 ARG repo=prod
+
 RUN set -x \
            && curl https://repo.infoclinica.ru/yum/centos/sds-${repo}-16.1.repo -o /etc/yum.repos.d/sds-${repo}-16.1.repo \
            && yum install tomcat-8.0.26-01 -y \
            && 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 \
            && chown -R tomcat:tomcat /etc/web-laboratory-admin \

+ 9 - 2
docker-entrypoint.sh

@@ -1,9 +1,16 @@
 #!/usr/bin/env bash
 
 if [ "$DB_CLUSTER" ]; then
-   sed -i "s/192.168.201.12:27017"/${DB_CLUSTER}/" /etc/web-laboratory-admin/application.conf
+   sed -i "s/192.168.201.12:27017/${DB_CLUSTER}/" /etc/web-laboratory-admin/application.conf
+fi
+
+sed -i "s/192\.168\.201\.13/0\.0\.0\.0/" /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
 
-sed -i "s/192\.168\.201\.13/${HOSTNAME}/" /etc/web-laboratory-admin/application.conf
 
 exec "$@"

+ 6 - 0
mongodb-org-3.6.repo

@@ -0,0 +1,6 @@
+[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

File diff suppressed because it is too large
+ 25 - 0
updatedb.sh


Some files were not shown because too many files changed in this diff