chore: 打包

Dockerfile

 FROM ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/ubuntu-python3:18.04
 
-WORKDIR /root/hikvision-isc
+ARG WORKNAME
 
-COPY ./ ./
+ENV LANG C.UTF-8
+WORKDIR /root/isc-video-record
 
-RUN pip install -e . -i https://pypi.tuna.tsinghua.edu.cn/simple/
+RUN pip install -U pip intelab-python-sdk
+
+RUN pip install supervisor \
+	&& echo_supervisord_conf > /etc/supervisord.conf \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& echo '[include]\nfiles = /etc/supervisor/conf.d/*.conf' >> /etc/supervisord.conf \
+	&& mkdir -p /var/log/supervisor
+
+COPY ./isc_video_record ./isc_video_record
+COPY ./tests ./tests
+COPY ./__init__.py ./__init__.py
+COPY ./setup.cfg ./setup.cfg
+COPY ./setup.py ./setup.py
+COPY ./README.md ./README.md
+COPY ./dockers/$WORKNAME.conf /etc/supervisor/conf.d/
+
+RUN pip install -e .
+
+ENTRYPOINT ["/usr/local/bin/supervisord"]

Makefile

@@ -24,7 +24,7 @@ image_version = $(shell cat setup.py| grep -Po "version='\K(\d+\.\d+\.\d+-?\w*)"
 docker_name = $(image_name):$(image_version)
 
 build: clean
-	@sudo docker build --no-cache --build-arg WORKNAME=${NAME} -t $(docker_name) .
+	@sudo docker build --build-arg WORKNAME=${NAME} -t $(docker_name) .
 	@sudo docker push $(docker_name)
 	@sudo docker rmi $(docker_name)
 	@echo 'Build successful! [$(docker_name)]'

README.md

@@ -93,16 +93,27 @@ pip install -e .
 
 ## 部署
 
+修订版本号`setup.py`：
+
+```
+setuptools.setup(
+    name='isc-video-record',
+    version='1.0.0a2',  # 版本号
+	...
+)
+```
+
 ### 打包并上传镜像
 
 ```
-make build
+make build NAME=recorder
+make build NAME=merger
 ```
 
 打包完成后有两个服务镜像：
-- intelab
+- `ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/isc_video_record/merger:$version`
   事件合并镜像-EventMerger
-- intelab
+- `ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/isc_video_record/recorder:$version`
   移动侦测事件取流录制模块-StreamRecorder
 
 ### 日志

dockers/merger.conf

+[supervisord]
+nodaemon=true
+
+[program:merger]
+command=isc_video_record merger -l /var/log/event_vss
+directory=/root/isc-video-record
+user=root
+stopasgroup=true
+killasgroup=true
+autostart=true
+autorestart=true

dockers/recorder.conf

+[supervisord]
+nodaemon=true
+
+[program:merger]
+command=isc_video_record recorder -l /var/log/event_vss
+directory=/root/isc-video-record
+user=root
+stopasgroup=true
+killasgroup=true
+autostart=true
+autorestart=true

setup.cfg

+[bdist_wheel]
+universal=1
+
+[build_sphinx]
+all-files = 1
+build-dir = docs/_build
+warning-is-error = 1

setup.py

@@ -21,7 +21,7 @@ requires = [
 
 setuptools.setup(
     name='isc-video-record',
-    version='1.0.0a1',
+    version='1.0.0a2',
     description='ISC motion detection playback video stream recording service.',
     long_description=long_description,
     long_description_content_type='text/markdown',