From 205671f06ddd5d1900d89adc1e19096eeaad7c3e Mon Sep 17 00:00:00 2001 From: "Antek S. Baranski" Date: Wed, 29 May 2019 18:43:20 -0700 Subject: [PATCH] Bump openCV - Remove jasper dependency as its not used --- build-stage/Dockerfile | 6 +++--- runtime/Dockerfile | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build-stage/Dockerfile b/build-stage/Dockerfile index 995efc6..28c539c 100644 --- a/build-stage/Dockerfile +++ b/build-stage/Dockerfile @@ -2,7 +2,7 @@ FROM esportsone/ffmpeg-alpine:4.1.1-golang LABEL maintainer="Denis Makogon. mail: lildee1991@gmail.com" -ENV OPENCV_VERSION=4.0.1 +ENV OPENCV_VERSION=4.1.0 ENV BUILD="ca-certificates \ git \ build-base \ @@ -19,7 +19,6 @@ ENV BUILD="ca-certificates \ libwebp-dev \ tiff \ libavc1394 \ - jasper-libs \ openblas \ libgphoto2 \ gstreamer \ @@ -28,7 +27,7 @@ ENV BUILD="ca-certificates \ ENV DEV="clang clang-dev cmake pkgconf \ openblas-dev gstreamer-dev gst-plugins-base-dev \ libgphoto2-dev libjpeg-turbo-dev libpng-dev \ - tiff-dev jasper-dev libavc1394-dev" + tiff-dev libavc1394-dev" RUN apk update && \ @@ -57,6 +56,7 @@ RUN mkdir /tmp/opencv && \ -D BUILD_opencv_python=NO \ -D BUILD_opencv_python2=NO \ -D BUILD_opencv_python3=NO \ + -D WITH_JASPER=OFF \ -D OPENCV_GENERATE_PKGCONFIG=YES .. && \ make -j4 && \ make install && \ diff --git a/runtime/Dockerfile b/runtime/Dockerfile index f95561e..46c7d56 100644 --- a/runtime/Dockerfile +++ b/runtime/Dockerfile @@ -16,9 +16,7 @@ ENV PKG="libstdc++ \ libwebp \ libwebp-dev \ tiff \ - jasper-libs \ libavc1394 \ - jasper-libs \ openblas \ libgphoto2 \ gstreamer \