Merge pull request #8 from xwu2git/master

alternative dockerfile naming convention
OpenVisualCloud · Apr 17, 2019 · 7e16017 · 7e16017
2 parents 11483a5 + 113d87d
commit 7e16017
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/...deo-analytics-service/Dockerfile.va.gst.1 → ...deo-analytics-service/Dockerfile.1.va.gst b/...deo-analytics-service/Dockerfile.va.gst.1 → ...deo-analytics-service/Dockerfile.1.va.gst
diff --git a/.../video-analytics-service/Dockerfile.gst.2 → .../video-analytics-service/Dockerfile.2.gst b/.../video-analytics-service/Dockerfile.gst.2 → .../video-analytics-service/Dockerfile.2.gst
diff --git a/...-analytics-service/Dockerfile.va.ffmpeg.3 → ...-analytics-service/Dockerfile.3.va.ffmpeg b/...-analytics-service/Dockerfile.va.ffmpeg.3 → ...-analytics-service/Dockerfile.3.va.ffmpeg
diff --git a/...deo-analytics-service/Dockerfile.ffmpeg.4 → ...deo-analytics-service/Dockerfile.4.ffmpeg b/...deo-analytics-service/Dockerfile.ffmpeg.4 → ...deo-analytics-service/Dockerfile.4.ffmpeg
diff --git a/...deo-analytics-service/Dockerfile.models.5 → ...deo-analytics-service/Dockerfile.5.models b/...deo-analytics-service/Dockerfile.models.5 → ...deo-analytics-service/Dockerfile.5.models
diff --git a/ad-insertion/video-analytics-service/update.sh b/ad-insertion/video-analytics-service/update.sh
@@ -6,7 +6,7 @@ DIR=$(dirname $(readlink -f "$0"))
 DOCKER_REPO="https://raw.githubusercontent.com/OpenVisualCloud/Dockerfiles/v1.0/Xeon/ubuntu-18.04/dldt%2Bffmpeg"
 
 base_name=xeon-ubuntu1804-dldt-ffmpeg-va
-docker_file="$DIR/Dockerfile.4"
+docker_file="$DIR/Dockerfile.4.ffmpeg"
 
 echo "# "${base_name} > ${docker_file}
 curl ${DOCKER_REPO}/Dockerfile >> ${docker_file}
@@ -15,7 +15,7 @@ curl ${DOCKER_REPO}/Dockerfile >> ${docker_file}
 DOCKER_REPO="https://raw.githubusercontent.com/OpenVisualCloud/Dockerfiles/v1.0/Xeon/ubuntu-18.04/dldt%2Bgst"
 
 base_name=xeon-ubuntu1804-dldt-gst-va
-docker_file="$DIR/Dockerfile.2"
+docker_file="$DIR/Dockerfile.2.gst"
 
 echo "# "${base_name} > ${docker_file}
 curl ${DOCKER_REPO}/Dockerfile>> ${docker_file}
diff --git a/script/build.sh b/script/build.sh
@@ -6,8 +6,8 @@ if test -z "${DIR}"; then
 fi 
 
 # build image(s) in order (to satisfy dependencies)
-for dep in .8 .7 .6 .5 .4 .3 .2 .1 ''; do
-    for dockerfile in `find "${DIR}" -name "Dockerfile*$dep" -print`; do
+for dep in '.8.*' '.7.*' '.6.*' '.5.*' '.4.*' '.3.*' '.2.*' '.1.*' ''; do
+    for dockerfile in `find "${DIR}" -name "Dockerfile${dep}" -print`; do
         image=$(head -n 1 "$dockerfile" | grep '# ' | cut -d' ' -f2)
         if test -z "$image"; then image="$IMAGE"; fi