Skip to content
This repository was archived by the owner on Dec 16, 2024. It is now read-only.

alternative dockerfile naming convention #8

Merged
merged 1 commit into from
Apr 17, 2019
Merged

alternative dockerfile naming convention #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...deo-analytics-service/Dockerfile.va.gst.1 → ...deo-analytics-service/Dockerfile.1.va.gst
View file
Open in desktop
File renamed without changes.
0 .../video-analytics-service/Dockerfile.gst.2 → .../video-analytics-service/Dockerfile.2.gst
View file
Open in desktop
File renamed without changes.
0 ...-analytics-service/Dockerfile.va.ffmpeg.3 → ...-analytics-service/Dockerfile.3.va.ffmpeg
View file
Open in desktop
File renamed without changes.
0 ...deo-analytics-service/Dockerfile.ffmpeg.4 → ...deo-analytics-service/Dockerfile.4.ffmpeg
View file
Open in desktop
File renamed without changes.
0 ...deo-analytics-service/Dockerfile.models.5 → ...deo-analytics-service/Dockerfile.5.models
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ad-insertion/video-analytics-service/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
4 changes: 2 additions & 2 deletions script/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down