Merge branch 'hkx/feature/rpc-method-header' into 'master'

Hkx/feature/rpc method header

See merge request !54

Dockerfile

@@ -40,7 +40,6 @@ RUN apk add --no-cache --virtual .build-deps  \
                 && echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config \
                 && apk add --no-cache  mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev \
                 && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
-                && apk del .build-deps \
                 && mkdir -p /data/log/search_tips/app
 
 ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/search_tips/app_conf.xml" \
@@ -50,5 +49,9 @@ COPY . /srv/apps/search_tips/
 
 WORKDIR /srv/apps/search_tips/
 
+RUN cat requirements.txt | grep master > /tmp/gm-requirements.txt \
+    && pip install --no-deps --upgrade -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/gm-requirements.txt \
+    && apk del .build-deps
+
 CMD gunicorn gm_rpcd.wsgi:application -w 5 -k gevent -b 0.0.0.0:8000
 

requirements.txt

 django==1.8
-kafka-python>=1.2.1,<1.4
 elasticsearch==6.3.1
 
 redis==2.10.6
@@ -13,13 +12,14 @@ gunicorn==19.9.0
 gevent==1.3.7
 pypinyin==0.34.1
 
-git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@master
-git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@master
-git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.3
+git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@v0.7.2
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.8.4
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3#egg=gm-config==0.1.3
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-protocol.git@master
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-upload.git@master
 git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
 git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@master
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-types.git@master
+git+ssh://git@git.wanmeizhensuo.com/system/kafka-python.git@master