修改标签

Dockerfile

-FROM ccr.ccs.tencentyun.com/gm-base/gm-alpine-ffmpeg:v1.1
+FROM ccr.ccs.tencentyun.com/gm-base/gm-alpine-ffmpeg:v1.2
 
 MAINTAINER wph [wangpenghong@igengmei.com]
 
@@ -11,6 +11,7 @@ RUN apk add --no-cache --virtual .build-deps  \
                 expat-dev \
                 findutils \
                 gcc \
+                g++ \
                 gdbm-dev \
                 libc-dev \
                 libffi-dev \
@@ -28,20 +29,24 @@ RUN apk add --no-cache --virtual .build-deps  \
                 tk-dev \
                 xz-dev \
                 zlib-dev \
-                # 业务相关依赖和安装工具
                 linux-headers \
+                musl-dev \
                 python3-dev \
+                openssl-dev \
                 librdkafka-dev \
                 mariadb-client \
                 mariadb-dev \
                 git \
                 openssh \
+                cargo \
+                g++ \
+                linux-headers \
                 \
                 && apk add --no-cache jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
                 # 取消ssh第一次链接的确认
                 && 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 \
+                && pip install --no-cache-dir -i https://pypi-1609228582764:0ca4878446d984cb4d8046f980ea0bfadffec639@gengmei-pypi.pkg.coding.net/tob/pypi/simple -r /tmp/requirements.txt \
                 && mkdir -p /tmp/video_convert \
                 && mkdir -p /data/log/mentha/app
 
@@ -52,7 +57,7 @@ COPY . /srv/apps/mentha/
 WORKDIR /srv/apps/mentha/
 
 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 \
+    && pip install --no-deps --upgrade -i https://pypi-1609228582764:0ca4878446d984cb4d8046f980ea0bfadffec639@gengmei-pypi.pkg.coding.net/tob/pypi/simple -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 --worker-tmp-dir /dev/shm

requirements.txt

@@ -26,9 +26,10 @@ sphinxcontrib-httpdomain==1.5.0
 requests==2.5.3
 bs4==0.0.1
 lxml==3.6.4
+cryptography==2.8
 
 openpyxl==2.5.3
-protobuf==3.6.0
+# protobuf==3.6.0
 
 pillow==5.3.0
 pymysql==0.9.2
@@ -44,4 +45,9 @@ git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.8.5
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.5
 git+ssh://git@git.wanmeizhensuo.com/rank/gm-text-miner.git@master
 sqlalchemy==1.3.20
-six==1.15.0
+six==1.10.0
+
+
+# brain客户端
+brain-grpc-client==1.1.29
+protobuf==3.6.0