diff --git a/Dockerfile.openvino b/Dockerfile.openvino index e92d1d8448..46196cfaff 100644 --- a/Dockerfile.openvino +++ b/Dockerfile.openvino @@ -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 diff --git a/Makefile b/Makefile index f58bc04478..85c3e448bd 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/ci/testOnCommit.groovy b/ci/testOnCommit.groovy index c98f47ce85..b6e8b1d376 100644 --- a/ci/testOnCommit.groovy +++ b/ci/testOnCommit.groovy @@ -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") {