Skip to content

Commit

Permalink
update all dockerfiles which based on centos7 and replace the centos7…
Browse files Browse the repository at this point in the history
… with ubuntu20.04
  • Loading branch information
tedlu2021 committed Jul 1, 2022
1 parent d898708 commit d6b7b05
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 23 deletions.
6 changes: 4 additions & 2 deletions analytics/common/VCAC-A/gst/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# smtc_analytics_common_vcac-a_gst

FROM centos:7 as build
FROM ubuntu:20.04 as build

RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq curl && rm -rf /var/lib/apt/lists/*

ARG VA_SERVING_REPO=https://raw.githubusercontent.com/intel/video-analytics-serving
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.6.1
FROM openvisualcloud/vcaca-ubuntu2004-analytics-gst:21.6.1

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/*

Expand Down
6 changes: 4 additions & 2 deletions analytics/common/Xeon/gst/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# smtc_analytics_common_xeon_gst

FROM centos:7 as build
FROM ubuntu:20.04 as build

RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq curl && rm -rf /var/lib/apt/lists/*

ARG VA_SERVING_REPO=https://raw.githubusercontent.com/intel/video-analytics-serving
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.6.1
FROM openvisualcloud/xeon-ubuntu2004-analytics-gst:21.6.1

RUN apt-get update -qq && apt-get install -qq python3-gst-1.0 python3-jsonschema python3-psutil && rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 2 additions & 2 deletions cloud/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM openvisualcloud/xeon-centos7-media-nginx:21.6.1
FROM openvisualcloud/xeon-ubuntu2004-media-nginx:21.6.1

RUN yum install -y -q epel-release && yum install -y -q python36-tornado python36-requests python36-ply && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-tornado python3-requests python3-ply && rm -rf /var/lib/apt/lists/*

COPY --from=smtc_common /home/*.py /home/
COPY --from=smtc_sensor_webrtc /home/owt/apps/current_app/public/scripts/owt.js /var/www/html/js/vendor/
Expand Down
6 changes: 4 additions & 2 deletions common/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

FROM centos:7
FROM ubuntu:20.04

RUN yum install -y -q epel-release && yum install -y -q python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
apt-get install -qq python3-requests python3-ply python3-psutil python3-pip && \
rm -rf /var/lib/apt/lists/*

COPY *.py /home/
ENV PYTHONIOENCODING=UTF-8
Expand Down
2 changes: 1 addition & 1 deletion deployment/certificate/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

FROM smtc_common
RUN yum install -y -q openssl && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq openssl && rm -rf /var/lib/apt/lists/*

####
ARG UID
Expand Down
4 changes: 2 additions & 2 deletions deployment/tunnel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM centos:7
FROM ubuntu:20.04

RUN yum install -y -q openssh-clients && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq openssh-client && rm -rf /var/lib/apt/lists/*
COPY *.sh /home/
CMD ["/home/tunnel.sh"]
WORKDIR /home
Expand Down
4 changes: 2 additions & 2 deletions gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM openvisualcloud/xeon-centos7-media-nginx:21.6.1
FROM openvisualcloud/xeon-ubuntu2004-media-nginx:21.6.1

RUN yum install -y -q epel-release && yum install -y -q python36-tornado python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-tornado python3-requests python3-ply python3-psutil && rm -rf /var/lib/apt/lists/*

COPY --from=smtc_common /home/*.py /home/
COPY *.py /home/
Expand Down
2 changes: 1 addition & 1 deletion maintenance/db-init/mkm4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ for s1 in data:
oi=oi+1
EOF

docker run --rm -v "$DIR:/home:ro" -it centos:7 python /home/mkm4.py /home/sensor-info.json > "$DIR/sensor-info.m4"
docker run --rm -v "$DIR:/home:ro" -it smtc_common:latest python3 /home/mkm4.py /home/sensor-info.json > "$DIR/sensor-info.m4"
rm -f "$DIR/mkm4.py"
fi

5 changes: 3 additions & 2 deletions maintenance/smart-upload/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.6.1
RUN yum install -y -q epel-release && yum install -y -q python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/* curl
FROM openvisualcloud/xeon-ubuntu2004-media-ffmpeg:21.6.1

RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-requests python3-ply python3-psutil curl && rm -rf /var/lib/apt/lists/*

COPY --from=smtc_common /home/*.py /home/
COPY *.py /home/
Expand Down
4 changes: 2 additions & 2 deletions sensor/discovery-ipcam/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.6.1
FROM openvisualcloud/xeon-ubuntu2004-media-ffmpeg:21.6.1

RUN yum install -y -q epel-release && yum -y -q install python36-ply python36-requests python36-setuptools && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-ply python3-requests python3-setuptools curl && rm -rf /var/lib/apt/lists/*

ARG ZEEP_VER=4.0.0
ARG ZEEP_REPO=https://github.com/mvantellingen/python-zeep/archive/${ZEEP_VER}.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions sensor/discovery-rtmp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM openvisualcloud/xeon-centos7-media-ffmpeg:21.6.1
FROM openvisualcloud/xeon-ubuntu2004-media-ffmpeg:21.6.1

RUN yum install -y -q epel-release && yum -y -q install python36-ply python36-requests python36-setuptools && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-ply python3-requests python3-setuptools && rm -rf /var/lib/apt/lists/*

COPY --from=smtc_common /home/*.py /home/
COPY *.py /home/
Expand Down
2 changes: 1 addition & 1 deletion sensor/simulation/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
DIR=$(dirname $(readlink -f "$0"))
IFS="," read -r -a SCENARIOS <<< "${2:-traffic}"

FFMPEG_IMAGE="openvisualcloud/xeon-centos7-media-ffmpeg:21.6.1"
FFMPEG_IMAGE="openvisualcloud/xeon-ubuntu2004-media-ffmpeg:21.6.1"
CLIPS_traffic=($(grep _traffic "$DIR"/streamlist.txt))
CLIPS_stadium=($(grep -v _traffic "$DIR"/streamlist.txt))

Expand Down
4 changes: 2 additions & 2 deletions storage/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM openvisualcloud/xeon-centos7-media-nginx:21.6.1
FROM openvisualcloud/xeon-ubuntu2004-media-nginx:21.6.1

RUN yum install -y -q epel-release && yum install -y -q python36-tornado python36-requests python36-ply python36-psutil && rm -rf /var/cache/yum/*
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && apt-get install -qq python3-tornado python3-requests python3-ply python3-psutil && rm -rf /var/lib/apt/lists/*

COPY --from=smtc_common /home/*.py /home/
COPY *.py /home/
Expand Down

0 comments on commit d6b7b05

Please sign in to comment.