Merge branch 'master' of http://git.quantgroup.cn/QA/qg-dockerfiles

baseimg/common/python/Dockerfile

+FROM 192.168.4.36/baseimg/centos:12251535
+
+WORKDIR /home/quant_group
+
+RUN yum -y update
+RUN yum install -y epel-release
+RUN yum install -y python-pip
+
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+RUN pip install --upgrade kubernetes
\ No newline at end of file

baseimg/common/python/requirements.txt

+PyYAML
+flask
+flask-restful
+python-jenkins
+kubernetes
+python-etcd
+logzero
\ No newline at end of file

templates/java/docker-entrypoint.sh

@@ -8,6 +8,7 @@ export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 echo "NAMESPACE is $NAMESPACE"
 sed -i "s#.xyqb.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#.domain.com#-$NAMESPACE.q-gp.com#g" ${config_path}
+sed -i "s#.quantgroup.cn#-$NAMESPACE.q-gp.com#g" ${config_path}
 
 sed -i "s#xterm.js demo#${SYSTEM_NAME}@${NAMESPACE}#"  /home/qg-xterm/demo/index.html
 

templates/tools/eos/Dockerfile

+FROM 192.168.4.36/baseimg/python:201802091706
+
+USER root
+
+WORKDIR /home/quant_group
+RUN mkdir project
+RUN mkdir /root/.kube
+
+COPY docker-entrypoint.sh .
+COPY dist.tgz ./project/dist.tgz
+COPY run.py ./project/run.py
+COPY kube_config /root/.kube/config
+
+RUN chmod +x ./docker-entrypoint.sh
+CMD ["./docker-entrypoint.sh"]
\ No newline at end of file

templates/tools/eos/docker-entrypoint.sh

+#!/bin/sh
+echo "deploy eos"
+package_path="/home/quant_group/project"
+
+echo "cd ${package_path}"
+cd ${package_path}
+
+echo "192.168.6.6 kubernetes" >> /etc/hosts
+
+echo "tar zxf ${package_path}/dist.tgz  -C ${package_path}"
+tar zxf ${package_path}/dist.tgz  -C ${package_path}/
+
+echo "rm dist.tgz public/dist -rf"
+rm -rf ${package_path}/dist.tgz
+
+echo "python run.py"
+python ${package_path}/run.py
+
+echo "cd /home/qg-xterm/;git pull;cd -"
+cd /home/qg-xterm/;git pull;cd -
+
+echo "node /home/qg-xterm/demo/app.js"
+nohup node /home/qg-xterm/demo/app.js &
\ No newline at end of file

templates/tools/eos/kube_config

+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNE1ESXdPVEEyTWpJME9Gb1hEVEk0TURJd056QTJNakkwT0Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTzlhCm1wY01JWmgrTUpoMGlXTWUzUDAyem1zS1pzK0RlOU9PYnRnb2ZiV3JmcWRrWEZPNHZCNzNDck9qTVBlL3NwTnYKQWZ1dkNuQkU5ZDREUmdLRVl0aWt5djBKeEFBeGFySmhpczhjeVBZUnNSTWZoZjNhRkMxL3M0Sk5Xa1NxVjVoVQpZdkpKQWpSUUxXYzhjeHJsejlINDBoYmNUYlZ0ZjJIY1kzNTJLRVgwaldhZ2tWT05DVVYvQy9KL3piU0ROM0ZiCjBIVUJOVUFMM2NzNjllV1ZXVDl4MEd2b3V5dG1Ga0NhNXBTc2hhRDJvUlN6TzZUMXNra3BzYUQ0Mmp5TmlTYk8KRFNCS3g4TU55RkVVVTdGR2I4Y0krdDVSR3dVY2ppcEJlMEdYWHc0alVneitpb3kzenFFQWNOVHc3MDRuak4wWAp1TEpyRSsrT3pIRldSNVA4eUtzQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFITm5GV3JOSkxveXp0UzI4QXNvRnoxMzh5WFIKZEVrM1Nrb2xoeW1rdlIvUnpTZ0pTV1JzbGZkZUdCYllKRVA1MDV6b2J1cVBKNkhsR3UxYStWbnhuZEExWnQvSgpYYVhNMklLdERQOHMwbHFxWTJqOE83WUM4RENHOU1RYW5CN2c2eXJhQzc2a2ZTeGZ0eGYzcGVvRFRGV29hMEw1Cm1mem96Y2NzdHhsT2t5WWtMc2RlRVNWRmdrcDR6Z0w1M3RDT242a0dBdjNDVEYvTEJwTlVjSkJzZHh3ekdYSnoKaUtsTDhaNzU5WUxvSnR6SmMwRzMrN1publlXQ3pmb3Z5ejhYVm9tOTVRZjdocnhvN2ZhQ09JSkszNVNxWjZxQQpkZXdocEF2amZNdHpHVFJqWGNBOFRvamRvenBUWjlyU3dFTWJzbjZjbi9vQklPdFo5ZitZZlJzQkowST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://192.168.6.6:6443
+  name: kubernetes
+contexts:
+- context:
+    cluster: kubernetes
+    user: kubernetes-admin
+  name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJTnNkanhjSlJodkV3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T0RBeU1Ea3dOakl5TkRoYUZ3MHhPVEF5TURrd05qSXlOVEJhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXlEcUpnQVJVOEQySHlycVEKUEVObEwxb3hTL0JwNURWdFpZMFF2Y0g5MU9TZE4xcHU0SUVoRDYxWlg2Rnlkak5PNzlud1haaGptUTRPTk44Ywo4b1FwQmQ4VzhlUzBGODQxNitMQU5tbE8ybEpFY1pPbG93aSs1d3ZLOVZ6aGpYeGFwMVMyaERNZXArUlhMR2lVCmpHWlN3UWg5WTVaK1JhYkp6SVpNL083ajc2L1IybVdVUjk3bml6QnNEYWhtVWRlS3p5bnZaRkZhaHlkVWVQQzQKcTZUQUFwbCt0WmEzWmFNMk85djIxb0dJblJ5eGoxUUY2R256Tkx0WVJUbDdQSmpWSStBMC9KZmd6Qy80dEZiSAo5TjNiMkx0VmxaOFFTQ0dpNHNkL3ZiSTBjODVEU3VuQWFocTE4bnVKcTFObU9EYS85UklyWGs3UzJVNUgwZy85CmNLY0VKd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFIQ3k2THgyaG45RURlWXp5RGdTUXczN1IrRURJaFIvS2IzVAp6WmRpRTFMaHdVZEwwTVBFSlVpQUhuZVB3VlBmNkpaQ2RrUnlYMFVZdFdGbnozSy9oaFl0NjJhUFhyZDlieEFNCnZqOGh0aVRqc24xMDViRlRDcVZPN1hIb3FFU2psK3NRNktYODI3UXZUMUZZTEV6M3hjNjRvSU0xcWNPNnFnd0cKWC82aEpvVEZLVFYyT0I4eDU4Ykgwa21mQWFWVC8rN01ZNElnVy8wREE1RnhJcFhkNm9TbHdJOUhnMjB2Nm5HeQoxNTNwUDZjL1BlZUFlYkZoYWc0L3l2ZE5zVWE0NUFRNVRoV0NZK3ZvRjFPbVZXMFI3dzYxK0dMUVhJUVU3VEFECkw2QnB5VEwydzZzUHJxU05ITmU4MjZJRUhQYnhoQkQ1R3owYzh1ZEM5djgvV2RaRm5OVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeURxSmdBUlU4RDJIeXJxUVBFTmxMMW94Uy9CcDVEVnRaWTBRdmNIOTFPU2ROMXB1CjRJRWhENjFaWDZGeWRqTk83OW53WFpoam1RNE9OTjhjOG9RcEJkOFc4ZVMwRjg0MTYrTEFObWxPMmxKRWNaT2wKb3dpKzV3dks5Vnpoalh4YXAxUzJoRE1lcCtSWExHaVVqR1pTd1FoOVk1WitSYWJKeklaTS9PN2o3Ni9SMm1XVQpSOTduaXpCc0RhaG1VZGVLenludlpGRmFoeWRVZVBDNHE2VEFBcGwrdFphM1phTTJPOXYyMW9HSW5SeXhqMVFGCjZHbnpOTHRZUlRsN1BKalZJK0EwL0pmZ3pDLzR0RmJIOU4zYjJMdFZsWjhRU0NHaTRzZC92YkkwYzg1RFN1bkEKYWhxMThudUpxMU5tT0RhLzlSSXJYazdTMlU1SDBnLzljS2NFSndJREFRQUJBb0lCQUJSMFhtMlVnN1RUSkZjaQpmZSthRnZFaWJwektYNWJ2bWxCZ2U5Qld5LzUrcUV6cVVSOWdNYWR2Vnd6ODZqdUcvRTVtWGpiQmhaTXlLMk5kClU1QzJ6WllLOTBZWXpna01pTmVqSDIydmpsMmhQOXEyY1pwWkgxOXRCZnZRMUQzbThUL2MySlJpd0lQNFFLdUoKdDNzc1ROSHBjeDNFVnZ2NGtPN3kzVlNOZHYyYU16dENsaVJ6bFVBVHRGSUp3S01RYndvRWNLLzJJRDdMaW5JRgpuUFVTSUtkK3FZMXJFbkVHV3JucEZobkozZDBpMTkzNm9XdzhMalgxa012RUpJWDlYU0swN2lCZEYrR1gxU1loCkMydVZCYjlSQmt4VVhoam41Nys2cGpVVzZmV2RJYW0zRXBEczltSzgyQm52KzQrTkxxUUU4SHJYV1RpSzVPR1YKaTkyRVRjRUNnWUVBM3BIVUZYbVJlMFJodTVOczUxQnphQlAyZ24zL0owUmY2bFNWQk1GbllmeGEvNVpRT012NgpsV1ZONW1OM2QwNXVsMEN2bmRrM2RLN2pPTG9LVjdUL0RTRlc5Mk83NzFEWnI0aFNHeHQ2dTE4S0s2clU3Y3d0CnpBVUMxeTZJS3lkekpONjNGUnZvMzkzTmw0alUySUxHd2VGZVZxQnJRL01Ebk9ycGYwdDl3SWNDZ1lFQTVrMnAKTCt1a0htWmE1QnVoUy9ja0M3SHQyQzNCZ0cxWWNMS0Y0U2w3TlRPQlZYcDhjL2Rzd2dTalpuMFBEVUVLWHFUMgpvOVJuTk9rS2MvOWo1VHhhaUJ6RHRrMDNqUXM4VlJwL2d1RHcrYkNJaURKL1p2N05GR2VGekdYVEtLdkxFVkFrClIvYnFvRXJHMkRmVDRXMnM3NG44c1UzU1JjRmpXbEY0OUM2UHAyRUNnWUVBbHBHeEdKWVZoWDdOWDBoczlFL0kKd3pBK0pDbDQ0K2V0dTZsYzVzcXdWZW1TNWpXYUw5Sk93NksxQUpkcHlweVUxRjQrY0ZyeTJVMDNDcmxSSmVTYwpaeFdXNytYWXpoMjBKcnZpVDlSWFEwc1labEk3bW1QMjEzN01YU1p0bUVRbjhWbDZJaDJ2ZlVOZ1FwT2U2cG9PClBEdHF4cy9md1NnMTJZSlNWSHVOcHlFQ2dZQjVpNnNyRzFZMnBSWjdKUW52cWJOZ2FMdDZTRXZEbC9JQktIYjMKNm9pWC8yTFcxaG93cWZqQVBPcHdBTGljNmlLcTZLMHlzYnIyZGJlS21OTUQvT0pheTdPTzF4bm1Xbk94QnBjZApYOUpPTlJrWnFHME0wcFV4bTZGRnlzZXl3MWdjL3dybTRDM2NBeHNHcWhBcy9WRXo2c051WUFBRnlKYkM2QlRKCjZuanVnUUtCZ0JXMFpObExPQ3phRXNJMHhwZGJBUnpmMG9McDJqbEtXZkNBYVZPNVJ5bDVmaDhGMWlTVFFXWUoKeEtkZ01Vckw0QzNNMVpYMmVVWURDWFBubGZ6Sk9RaGwrcG9JM1pOOEg5L2VER21vdlovczZjQytjL0dqR2ZnNgpxQlZxdG9oc2d6RTVJWWQ3NGZqR0txRDZ2dndBVVZZZStFVkM0ZCtXUEMrZ3A5RytoRkdXCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file