mirror of
https://github.com/koush/scrypted.git
synced 2026-02-03 14:13:28 +00:00
server/docker: actually disable opencv build this time?
This commit is contained in:
@@ -7,6 +7,5 @@ COPY . .
|
|||||||
WORKDIR /server
|
WORKDIR /server
|
||||||
ENV OPENCV4NODEJS_DISABLE_AUTOBUILD=true
|
ENV OPENCV4NODEJS_DISABLE_AUTOBUILD=true
|
||||||
RUN npm install
|
RUN npm install
|
||||||
RUN ./build-opencv4nodejs-linux.sh
|
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
CMD npm run serve-no-build
|
CMD npm run serve-no-build
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
export OPENCV4NODEJS_DEFINES="remove_cv_t=remove_cv"
|
|
||||||
export OPENCV4NODEJS_INCLUDES=/usr/local/Cellar/opencv@3/3.4.15/include/
|
|
||||||
export OPENCV4NODEJS_BIN=/usr/local/Cellar/opencv@3/3.4.15/bin/
|
|
||||||
export LDFLAGS=$(pkg-config opencv --libs)
|
|
||||||
cd node_modules/@koush/opencv4nodejs
|
|
||||||
npm run build
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
HAS_OPENCV_3=$(pkg-config --modversion opencv)
|
|
||||||
if [ ! -z "$HAS_OPENCV_3" ]
|
|
||||||
then
|
|
||||||
OPENCV_VERSION=opencv
|
|
||||||
else
|
|
||||||
OPENCV_VERSION=opencv4
|
|
||||||
fi
|
|
||||||
echo $OPENCV_VERSION
|
|
||||||
export CFLAGS=$(pkg-config --cflags $OPENCV_VERSION)
|
|
||||||
export CXXFLAGS=$(pkg-config --cflags $OPENCV_VERSION)
|
|
||||||
export LDFLAGS="-Wl,--no-as-needed $(pkg-config --libs $OPENCV_VERSION)"
|
|
||||||
echo $LDFLAGS
|
|
||||||
cd node_modules/@koush/opencv4nodejs
|
|
||||||
npm run build
|
|
||||||
Reference in New Issue
Block a user