Add user owt in Dockerfile (#773)

Co-authored-by: ChenLi <[email protected]>

Author: qwu16

doc/servermd/AnalyticsGuide.md

@@ -135,7 +135,7 @@ Start up MCU in Docker container:
 
 ````
 cd Release-vxxx
-./bin/init-all.sh --deps
+./bin/init-all.sh --deps ##default password for user owt is owt
 ./bin/start-all.sh
 ````
 

docker/Dockerfile

@@ -220,13 +220,18 @@ WORKDIR /home
 ARG NODE_VER=v10.21.0
 ARG NODE_REPO=https://nodejs.org/dist/${NODE_VER}/node-${NODE_VER}-linux-x64.tar.xz
 
-COPY --from=owt-build /home/owt-server/dist /home/owt
-COPY startowt.sh /home/
-
-RUN apt-get update && apt-get install -y -q --no-install-recommends ca-certificates wget xz-utils rabbitmq-server mongodb libboost-system-dev libboost-thread-dev liblog4cxx-dev libglib2.0-0 libfreetype6-dev curl
+RUN apt-get update && apt-get install -y -q --no-install-recommends ca-certificates wget xz-utils rabbitmq-server mongodb libboost-system-dev libboost-thread-dev liblog4cxx-dev libglib2.0-0 libfreetype6-dev curl sudo
 
 RUN wget ${NODE_REPO} && \
     tar xf node-${NODE_VER}-linux-x64.tar.xz && \
     cp node-*/* /usr/local -rf && rm -rf node-*
 
+RUN useradd -m owt && echo "owt:owt" | chpasswd && adduser owt sudo
+
+COPY --chown=owt:owt --from=owt-build /home/owt-server/dist /home/owt
+COPY --chown=owt:owt startowt.sh /home/
+
+USER owt
+
+CMD /bin/bash
 ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib/x86_64-linux-gnu

docker/README.md

@@ -44,10 +44,13 @@ Note that `externalip` and `network_interface` should be both set if there are e
     a) Launch a Docker container with following command to simply try OWT:
 
     ```shell
-    docker run -itd --name=owt --net=host owt:run /home/startowt.sh
+    docker run -itd --name=owt --net=host owt:run bash
+    docker exec -it owt bash
+    cd /home/
+    ./startowt.sh    ##default password for user owt is owt
     ```
     Then OWT service should be launched and you can connect to https://localhost:3004 to start your OWT journey.
 
     b) Launch OWT service with Docker swarm with script ```conference/build_server.sh```
     
-    c) Customize different OWT module images and launch OWT service with Kubernetes.
+    c) Customize different OWT module images and launch OWT service with Kubernetes.

docker/gst-analytics.Dockerfile

@@ -521,19 +521,14 @@ ARG IE_DIR=/home/build/opt/intel/dldt/inference-engine
 
 RUN mkdir -p ${IE_DIR}/include && \
     cp -r /opt/intel/openvino_2021/inference_engine/include/* ${IE_DIR}/include && \
-
     mkdir -p ${IE_DIR}/lib/intel64 && \
     cp -r /opt/intel/openvino_2021/inference_engine/lib/intel64/* ${IE_DIR}/lib/intel64 && \
-
     mkdir -p ${IE_DIR}/share && \
     cp -r  /opt/intel/openvino_2021/inference_engine/share/* ${IE_DIR}/share/ && \
-
     mkdir -p ${IE_DIR}/external/ && \
     cp -r /opt/intel/openvino_2021/inference_engine/external/* ${IE_DIR}/external && \
-
     mkdir -p ${IE_DIR}/external/opencv && \
     cp -r /opt/intel/openvino_2021/opencv/* ${IE_DIR}/external/opencv/ && \
-
     mkdir -p ${IE_DIR}/external/ngraph && \
     cp -r /opt/intel/openvino_2021/deployment_tools/ngraph/* ${IE_DIR}/external/ngraph/
 
@@ -585,7 +580,7 @@ RUN cd ${SERVER_PATH} && ./scripts/build.js -t mcu -r -c && \
 FROM ubuntu:18.04 AS owt-run
 LABEL Description="This is the base image for GSTREAMER & DLDT Ubuntu 18.04 LTS"
 LABEL Vendor="Intel Corporation"
-WORKDIR /root
+WORKDIR /home
 
 # Prerequisites
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends \
@@ -612,14 +607,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-
     \
     libmpeg2-4-dev libopencore-amrnb-dev libopencore-amrwb-dev liba52-0.7.4-dev \
     \
-    libva-dev libxrandr-dev libudev-dev liblog4cxx-dev gstreamer1.0-plugins-ugly rabbitmq-server mongodb \
+    libva-dev libxrandr-dev libudev-dev liblog4cxx-dev gstreamer1.0-plugins-ugly rabbitmq-server mongodb sudo\
     \
+    && useradd -m owt && echo "owt:owt" | chpasswd && adduser owt sudo \
     && rm -rf /var/lib/apt/lists/* 
 
 # Install
-COPY --from=dldt-build /home/build /
-COPY --from=gst-build /home/build /
-COPY --from=owt-build /home/owt-server/dist /home/owt
 
 ARG LIBDIR=/usr/lib/x86_64-linux-gnu
 
@@ -653,7 +646,10 @@ ARG SOURCE_REV
 ARG DLSTREAMER_VERSION=1.2.1
 ARG DLSTREAM_SOURCE_REPO=https://github.com/openvinotoolkit/dlstreamer_gst/archive/v${DLSTREAMER_VERSION}.tar.gz
 
-COPY analyticspage /home/analyticspage
+COPY --chown=owt:owt --from=dldt-build /home/build /
+COPY --chown=owt:owt --from=gst-build /home/build /
+COPY --chown=owt:owt --from=owt-build /home/owt-server/dist /home/owt
+COPY --chown=owt:owt analyticspage /home/analyticspage
 ARG ENABLE_PAHO_INSTALLATION=false
 ARG ENABLE_RDKAFKA_INSTALLATION=false
 ARG BUILD_TYPE=Release
@@ -673,12 +669,14 @@ RUN wget ${DLSTREAM_SOURCE_REPO} && tar zxf v${DLSTREAMER_VERSION}.tar.gz &&  mv
         .. \
         && make -j $(nproc) \
         && make install \
-        && rm /root/v${DLSTREAMER_VERSION}.tar.gz
+        && rm /home/v${DLSTREAMER_VERSION}.tar.gz
 
 RUN cp /home/analyticspage/index.js /home/owt/apps/current_app/public/scripts/ \
     && cp /home/analyticspage/rest-sample.js /home/owt/apps/current_app/public/scripts/ \
     && cp /home/analyticspage/index.html /home/owt/apps/current_app/public/ \
     && cp /home/analyticspage/samplertcservice.js /home/owt/apps/current_app/
 
-ENV GST_PLUGIN_PATH=/root/gst-video-analytics/
-ENV PYTHONPATH=/root/gst-video-analytics/python:$PYTHONPATH
+USER owt
+
+ENV GST_PLUGIN_PATH=/home/gst-video-analytics/
+ENV PYTHONPATH=/home/gst-video-analytics/python:$PYTHONPATH