fix upload dockerhub readme issue (#496)

OpenVisualCloud · May 12, 2020 · 5320a42 · 5320a42
1 parent bf7a220
commit 5320a42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile b/VCAC-A/ubuntu-18.04/analytics/dev/Dockerfile
@@ -584,7 +584,6 @@ RUN wget -O - ${LIBRDKAFKA_REPO} | tar xz && \
     make install;
 
 
-
 #Install va gstreamer plugins from source
 ARG VA_GSTREAMER_PLUGINS_VER=v1.0.0 
 ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics
@@ -619,6 +618,7 @@ RUN mkdir -p /opt/intel/dl_streamer/python && \
 ENV GST_PLUGIN_PATH=${GST_PLUGIN_PATH}:/usr/local/lib/x86_64-linux-gnu/gstreamer-1.0
 ENV PYTHONPATH=${PYTHONPATH}:/opt/intel/dl_streamer/python
 
+
 # Build gstreamer python
 ARG GST_VER=1.16.0
 ARG GST_PYTHON_REPO=https://gstreamer.freedesktop.org/src/gst-python/gst-python-${GST_VER}.tar.xz

diff --git a/script/image.cmake b/script/image.cmake
@@ -10,5 +10,5 @@ add_dependencies(update_dockerfile update_${image}_dockerfile)
 add_custom_target(generate_${image}_readme COMMAND "${CMAKE_SOURCE_DIR}/script/generate_readme.py" "${CMAKE_CURRENT_SOURCE_DIR}")
 add_dependencies(generate_readme generate_${image}_readme)
 
-add_custom_target(upload_${image}_readme COMMAND "${CMAKE_SOURCE_DIR}/script/upload-dockerhub-readme.sh" ${DOCKER_PREFIX} ${image} "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+add_custom_target(upload_${image}_readme COMMAND "${CMAKE_SOURCE_DIR}/script/upload-dockerhub-readme.sh" ${DOCKER_PREFIX} "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 add_dependencies(upload_readme upload_${image}_readme)
diff --git a/script/upload-dockerhub-readme.sh b/script/upload-dockerhub-readme.sh
@@ -1,19 +1,20 @@
 #!/bin/bash -e
 IFS=$'\n\t'
 
-if [[ -z "$3" ]]; then
-    echo "Usage: ./update-dockerhub-readme.sh <docker_prefix> <image> <readme_filepath>"
+if [[ -z "$2" ]]; then
+    echo "Usage: ./update-dockerhub-readme.sh <docker_prefix> <readme_filepath>"
     exit 1
 fi 
 
 DOCKER_PREFIX="$1"
-IMAGE="$2"
-README_FILEPATH="$3"
+README_FILEPATH="$2"
+IMAGE=$(echo $README_FILEPATH | awk -F"Dockerfiles/" '{print $2}' | awk -F"/README.md" '{print $1}' | sed 's/[-.]//g'| sed 's/\//-/g' | tr 'A-Z' 'a-z')
 DOCKERHUB_TOKEN=~/.dockerhub_token
 REPO_URL="https://hub.docker.com/v2/repositories/${DOCKER_PREFIX}/${IMAGE}/"
-IGNORE_LIST=("graphics" "owt-immersive")
+IGNORE_LIST=("graphics" "immersive")
 IGNORE_FLAG=-1
 
+
 if [[ ! -e "${README_FILEPATH}" ]]; then
     echo "${README_FILEPATH} Error: no such file"
     exit 1
@@ -29,6 +30,7 @@ done
 
 if [[ ${IGNORE_FLAG} == 0 ]]; then
     echo "Ignore ${README_FILEPATH}"
+    exit 0
 else
     echo "Updating ${README_FILEPATH}"
 fi