diff --git a/Dockerfile b/Dockerfile index 29ff36a30..06cdd5e99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,5 @@ COPY . . WORKDIR /server ENV OPENCV4NODEJS_DISABLE_AUTOBUILD=true RUN npm install -RUN ./build-opencv4nodejs-linux.sh RUN npm run build CMD npm run serve-no-build diff --git a/server/build-opencv4nodejs-darwin.sh b/server/build-opencv4nodejs-darwin.sh deleted file mode 100755 index 08be06d35..000000000 --- a/server/build-opencv4nodejs-darwin.sh +++ /dev/null @@ -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 diff --git a/server/build-opencv4nodejs-linux.sh b/server/build-opencv4nodejs-linux.sh deleted file mode 100755 index e57ebe069..000000000 --- a/server/build-opencv4nodejs-linux.sh +++ /dev/null @@ -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