Merge pull request #190 from QuPengfei/multi-device

add SG1

Author: xwu2git

cdn-server/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-ubuntu1804-media-nginx:20.7
+FROM openvisualcloud/xeon-ubuntu1804-media-nginx:21.3
 
 Run DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-setuptools python3-redis python-celery-common python3-tornado python3-kafka python3-kazoo openssh-server && rm -rf /var/lib/apt/lists/*
 

deployment/kubernetes/yaml/build.sh

@@ -11,5 +11,5 @@ HOSTIP=$(ip route get 8.8.8.8 | awk '/ src /{split(substr($0,index($0," src ")),
 . "${DIR}/../volume-info.sh"
 echo "NVODS=${NVODS} NLIVES=${NLIVES} SCENARIO=${SCENARIO} PLATFORM=${PLATFORM}"
 for template in $(find "${DIR}" -maxdepth 1 -name "*.yaml.m4" -print); do
-    m4 -DNVODS=${NVODS} -DNLIVES=${NLIVES} -DSCENARIO=${SCENARIO} -DPLATFORM=${PLATFORM} -DHOSTIP=${HOSTIP} -DREGISTRY_PREFIX=${REGISTRY} $(env | grep _VOLUME_ | sed 's/^/-D/') -I "${DIR}" "${template}" > "${template/.m4/}"
+    m4 -DNVODS=${NVODS} -DNLIVES=${NLIVES} -DSCENARIO=${SCENARIO} -DPLATFORM=${PLATFORM} -DUSERID=$(id -u) -DGROUPID=$(id -g) -DHOSTIP=${HOSTIP} -DREGISTRY_PREFIX=${REGISTRY} $(env | grep _VOLUME_ | sed 's/^/-D/') -I "${DIR}" "${template}" > "${template/.m4/}"
 done

deployment/kubernetes/yaml/live.yaml.m4

@@ -23,7 +23,7 @@ spec:
       enableServiceLinks: false
       containers:
         - name: live-defn(`LIDX')
-          image: defn(`REGISTRY_PREFIX')`tc_transcode_'defn(`PLATFORM_SUFFIX'):latest
+          image: defn(`REGISTRY_PREFIX')tc_transcode_xeon:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -57,7 +57,7 @@ loopifdef(KIDX,0,``LIVE_'defn(`LIDX')`_'defn(`KIDX')_PROTOCOL',`dnl
             "-an", 
             "-f", "flv", "`rtmp://cdn-service/'defn(`LIVE_'defn(`LIDX')`_'defn(`KIDX')_PROTOCOL)`/media_'defn(`LIDX')`_'defn(`KIDX')",
 ')dnl
-            "-abr_pipeline"]
+            ]
       volumes:
           - name: video-archive
             persistentVolumeClaim:

deployment/kubernetes/yaml/vod.yaml.m4

@@ -52,6 +52,14 @@ ifelse(defn(`PLATFORM'),`Xeon',,`dnl
               name: video-archive
               readOnly: true
 defn(`PLATFORM_RESOURCES')dnl
+      initContainers:
+        - image: busybox:latest
+          imagePullPolicy: IfNotPresent
+          name: init
+          command: ["sh", "-c", "chown -R 1000:1000 /var/www/video"]
+          volumeMounts:
+            - mountPath: /var/www/video
+              name: video-cache
       volumes:
           - name: video-cache
             persistentVolumeClaim:

doc/cmake.md

@@ -3,7 +3,7 @@
 
 Use the following definitions to customize the building process:   
 - **REGISTRY**: Specify the URL of the privcay docker registry.    
-- **PLATFORM**: Specify the target platform: `Xeon` or `XeonE3`.  
+- **PLATFORM**: Specify the target platform: `Xeon` , `XeonE3` or `SG1`.
 - **SCENARIO**: Specify the sample scenario(s): `transcode` or `cdn`.  
 - **NLIVES**: Specify the number of live streaming services in the deployment. 
 - **NVODS**: Specify the number of vod transcoding services in the deployment.  

streaming-server/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-ubuntu1804-media-nginx:20.7
+FROM openvisualcloud/xeon-ubuntu1804-media-nginx:21.3
 COPY *.conf /etc/nginx/
 CMD  ["/usr/sbin/nginx"]
 WORKDIR /home

xcode-server/SG1/Dockerfile

@@ -0,0 +1,20 @@
+# tc_transcode_sg1
+
+FROM openvisualcloud/sg1-ubuntu1804-media-ffmpeg:21.3
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-tornado python3-kafka python3-kazoo python3-psutil && rm -rf /var/lib/apt/lists/*
+
+COPY --from=tc_common /home/ /home/
+COPY *.py  /home/
+CMD    ["/home/main.py"]
+WORKDIR /home
+
+####
+ARG  UID
+ARG  GID
+## must use ; here to ignore user exist status code
+RUN  [ ${GID} -gt 0 ] && groupadd -f -g ${GID} docker; \
+     [ ${UID} -gt 0 ] && useradd -d /home/docker -g ${GID} -K UID_MAX=${UID} -K UID_MIN=${UID} docker; \
+     chown -R ${UID}:${GID} /home
+USER ${UID}
+####

xcode-server/Xeon/Dockerfile

@@ -1,6 +1,6 @@
 # tc_transcode_xeon
 
-FROM openvisualcloud/xeon-ubuntu1804-media-ffmpeg:20.7
+FROM openvisualcloud/xeon-ubuntu1804-media-ffmpeg:21.3
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-tornado python3-kafka python3-kazoo python3-psutil && rm -rf /var/lib/apt/lists/*
 
 COPY --from=tc_common /home/ /home/

xcode-server/XeonE3/Dockerfile

@@ -1,6 +1,6 @@
 # tc_transcode_xeone3
 
-FROM openvisualcloud/xeone3-ubuntu1804-media-ffmpeg:20.7
+FROM openvisualcloud/xeone3-ubuntu1804-media-ffmpeg:21.3
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-tornado python3-kafka python3-kazoo python3-psutil && rm -rf /var/lib/apt/lists/*