Merge pull request #193 from QuPengfei/multi-device

upgrade docker image to 21.3
OpenVisualCloud · Mar 25, 2021 · ccf5304 · ccf5304
2 parents 9183f2a + e4a378a
commit ccf5304
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/cdn-server/Dockerfile b/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/*
 

diff --git a/deployment/kubernetes/yaml/build.sh b/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
diff --git a/deployment/kubernetes/yaml/live.yaml.m4 b/deployment/kubernetes/yaml/live.yaml.m4
@@ -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:

diff --git a/deployment/kubernetes/yaml/vod.yaml.m4 b/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:

diff --git a/streaming-server/Dockerfile b/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

diff --git a/xcode-server/Xeon/Dockerfile b/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/

diff --git a/xcode-server/XeonE3/Dockerfile b/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/*