Merge pull request OpenVisualCloud#784 from xwu2git/master

upgrade to v21.6
StefaniaHergane · Jul 31, 2021 · 1cfedb4 · 1cfedb4
2 parents 39f11be + 50deee0
commit 1cfedb4
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/analytics/common/VCAC-A/gst/Dockerfile b/analytics/common/VCAC-A/gst/Dockerfile
@@ -8,7 +8,7 @@ ARG  VA_SERVING_TAG="v0.4.1-beta"
 RUN  mkdir -p /home/vaserving/common/utils && touch /home/vaserving/__init__.py /home/vaserving/common/__init__.py /home/vaserving/common/utils/__init__.py && for x in common/utils/logging.py common/settings.py arguments.py ffmpeg_pipeline.py gstreamer_pipeline.py app_destination.py app_source.py gstreamer_app_destination.py gstreamer_app_source.py model_manager.py pipeline.py pipeline_manager.py pipeline.py schema.py vaserving.py; do curl -sSf -o /home/vaserving/$x -L ${VA_SERVING_REPO}/${VA_SERVING_TAG}/vaserving/$x; done
 COPY *.py /home/
 
-FROM openvisualcloud/vcaca-ubuntu1804-analytics-gst:21.3.1
+FROM openvisualcloud/vcaca-ubuntu1804-analytics-gst:21.6
 
 RUN  DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-gst-1.0 python3-jsonschema python3-psutil && rm -rf /var/lib/apt/lists/*
 

diff --git a/analytics/common/Xeon/gst/Dockerfile b/analytics/common/Xeon/gst/Dockerfile
@@ -8,7 +8,7 @@ ARG  VA_SERVING_TAG="v0.4.1-beta"
 RUN  mkdir -p /home/vaserving/common/utils && touch /home/vaserving/__init__.py /home/vaserving/common/__init__.py /home/vaserving/common/utils/__init__.py && for x in common/utils/logging.py common/settings.py arguments.py ffmpeg_pipeline.py gstreamer_pipeline.py app_destination.py app_source.py gstreamer_app_destination.py gstreamer_app_source.py model_manager.py pipeline.py pipeline_manager.py pipeline.py schema.py vaserving.py; do curl -sSf -o /home/vaserving/$x -L ${VA_SERVING_REPO}/${VA_SERVING_TAG}/vaserving/$x; done
 COPY *.py /home/
 
-FROM openvisualcloud/xeon-ubuntu1804-analytics-gst:21.3.1
+FROM openvisualcloud/xeon-ubuntu1804-analytics-gst:21.6
 
 RUN  apt-get update -qq && apt-get install -qq python3-gst-1.0 python3-jsonschema python3-psutil && rm -rf /var/lib/apt/lists/*
 

diff --git a/cloud/Dockerfile b/cloud/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-centos7-media-nginx:21.3.1
+FROM openvisualcloud/xeon-centos7-media-nginx:21.6
 
 RUN  yum install -y -q epel-release && yum install -y -q python36-tornado python36-requests python36-ply && rm -rf /var/cache/yum/*
 

diff --git a/gateway/Dockerfile b/gateway/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-centos7-media-nginx:21.3.1
+FROM openvisualcloud/xeon-centos7-media-nginx:21.6
 
 RUN yum install -y -q epel-release && yum install -y -q python36-tornado python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/*
 

diff --git a/maintenance/smart-upload/Dockerfile b/maintenance/smart-upload/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.3.1
+FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.6
 RUN  yum install -y -q epel-release && yum install -y -q python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/* curl
 
 COPY --from=smtc_common /home/*.py /home/

diff --git a/sensor/discovery-ipcam/Dockerfile b/sensor/discovery-ipcam/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.3.1
+FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.6
 
 RUN yum install -y -q epel-release && yum -y -q install python36-ply python36-requests python36-setuptools && rm -rf /var/cache/yum/*
 

diff --git a/sensor/discovery-rtmp/Dockerfile b/sensor/discovery-rtmp/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.3.1
+FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.6
 
 RUN yum install -y -q epel-release && yum -y -q install python36-ply python36-requests python36-setuptools && rm -rf /var/cache/yum/*
 

diff --git a/sensor/simulation/download.sh b/sensor/simulation/download.sh
@@ -3,7 +3,7 @@
 DIR=$(dirname $(readlink -f "$0"))
 IFS="," read -r -a SCENARIOS <<< "${2:-traffic}"
 
-FFMPEG_IMAGE="openvisualcloud/xeon-centos7-media-ffmpeg:21.3.1"
+FFMPEG_IMAGE="openvisualcloud/xeon-centos7-media-ffmpeg:21.6"
 CLIPS_traffic=($(grep _traffic "$DIR"/streamlist.txt))
 CLIPS_stadium=($(grep -v _traffic "$DIR"/streamlist.txt))
 

diff --git a/sensor/srs/Dockerfile b/sensor/srs/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-ubuntu1804-media-srs:21.3.1
+FROM openvisualcloud/xeon-ubuntu1804-media-srs:21.6
 
 RUN mkdir -p /usr/local/srs/objs/ffmpeg/bin/ && cp /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
 

diff --git a/sensor/webrtc/Dockerfile b/sensor/webrtc/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-ubuntu1804-service-owt:21.3.1
+FROM openvisualcloud/xeon-ubuntu1804-service-owt:21.6
 
 RUN  apt-get update -q && apt-get install -y -q nginx python3-tornado python3-requests python3-ply && rm -rf /var/lib/apt/lists/*
 

diff --git a/storage/Dockerfile b/storage/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openvisualcloud/xeon-centos7-media-nginx:21.3.1
+FROM openvisualcloud/xeon-centos7-media-nginx:21.6
 
 RUN yum install -y -q epel-release && yum install -y -q python36-tornado python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/*
 

diff --git a/storage/cleanup.py b/storage/cleanup.py
@@ -31,7 +31,7 @@ def quit_service(signum, sigframe):
     })
 
 while not stop.is_set(): 
-    print("Searching...",flush=True)
+    print("Cleaning...",flush=True)
     for index in indexes:
         if stop.is_set(): break