Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use parameter for the sample file location #48

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

use parameter for the sample file location #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bb8654
use parameter for the sample file location
dtrawins Oct 10, 2023
0ccbfcf
fix
dtrawins Oct 10, 2023
1b35d9f
fix param
dtrawins Oct 10, 2023
874ccb8
change branch
dtrawins Oct 10, 2023
93040ed
no proxy
dtrawins Oct 10, 2023
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
4 changes: 2 additions & 2 deletions Dockerfile.openvino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ RUN cd flatbuffers && mkdir build && cd build && cmake -G "Unix Makefiles" -DCMA
## End of base image

FROM base as build

RUN wget -O video.mp4 "https://www.pexels.com/download/video/3044127/?fps=24.0&h=1080&w=1920"
ARG SAMPLE_VIDEO=https://www.pexels.com/download/video/3044127/?fps=24.0&h=1080&w=1920
RUN wget -O video.mp4 ${SAMPLE_VIDEO}
COPY . /mediapipe/

# BUILD examples
Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,22 @@

HTTP_PROXY := "$(http_proxy)"
HTTPS_PROXY := "$(https_proxy)"
NO_PROXY := "$(no_proxy)"
OVMS_MEDIA_DOCKER_IMAGE ?= mediapipe_ovms
OVMS_MEDIA_IMAGE_TAG ?= latest
OVMS_BRANCH ?= "mediapipe_integration"
OVMS_BRANCH ?= main
SAMPLE_VIDEO ?= https://www.pexels.com/download/video/3044127/?fps=24.0&h=1080&w=1920
JOBS ?= $(shell python3 -c 'import multiprocessing as mp; print(mp.cpu_count())')
DLDT_PACKAGE_URL ?= https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/linux/l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64.tgz

# Targets to use outside running mediapipe_ovms container
docker_build:
docker build -f Dockerfile.openvino \
--build-arg http_proxy=$(HTTP_PROXY) --build-arg https_proxy=$(HTTPS_PROXY) \
--build-arg http_proxy=$(HTTP_PROXY) --build-arg https_proxy=$(HTTPS_PROXY) --build-arg no_proxy=$(NO_PROXY) \
--build-arg DLDT_PACKAGE_URL=$(DLDT_PACKAGE_URL) \
--build-arg JOBS=$(JOBS) . \
--build-arg OVMS_BRANCH=$(OVMS_BRANCH) \
--build-arg SAMPLE_VIDEO="$(SAMPLE_VIDEO)" \
-t $(OVMS_MEDIA_DOCKER_IMAGE):$(OVMS_MEDIA_IMAGE_TAG)

tests: run_unit_tests run_hello_world run_hello_ovms
Expand Down
2 changes: 1 addition & 1 deletion ci/testOnCommit.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pipeline {
}
stage("build image") {
steps {
sh script: "make docker_build OVMS_MEDIA_IMAGE_TAG=${shortCommit}"
sh script: "make docker_build OVMS_MEDIA_IMAGE_TAG=${shortCommit} SAMPLE_VIDEO=http://s3.toolbox.iotg.sclab.intel.com/video-samples/video.mp4"
}
}
stage("unit tests") {
Expand Down