From 353aaf99180cfa0529cc41406bcf6902de1b7db8 Mon Sep 17 00:00:00 2001 From: Sergey Krashevich Date: Wed, 4 Jan 2023 03:54:31 +0300 Subject: [PATCH 1/2] increase SQLITE_MAX_VARIABLE_NUMBER --- .build/Dockerfile | 11 +++++++++++ api/package.json | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.build/Dockerfile b/.build/Dockerfile index 1130980a..b915ab97 100644 --- a/.build/Dockerfile +++ b/.build/Dockerfile @@ -1,3 +1,4 @@ +# syntax = docker/dockerfile-upstream:master-labs FROM ubuntu:20.04 as build ARG DEBIAN_FRONTEND=noninteractive @@ -5,9 +6,19 @@ RUN apt-get update && apt-get install -y curl bash RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - RUN apt-get install -y nodejs gcc g++ make libpixman-1-dev libcairo2-dev libpango1.0-dev libjpeg8-dev libgif-dev jq +WORKDIR /src/sqlite +ADD https://github.com/WiseLibs/better-sqlite3/raw/v7.5.3/deps/sqlite3/sqlite3.c . +ADD https://github.com/WiseLibs/better-sqlite3/raw/v7.5.3/deps/sqlite3/sqlite3.h . +ADD https://github.com/WiseLibs/better-sqlite3/raw/v7.5.3/deps/sqlite3/sqlite3ext.h . + +RUN < sqlite3.c +EOT WORKDIR /double-take/api COPY /api/package.json . RUN npm install --production +RUN curl -L https://gobinaries.com/tj/node-prune | /bin/sh && node-prune WORKDIR /double-take/frontend COPY /frontend/package.json . diff --git a/api/package.json b/api/package.json index d417df8e..d6c8ed07 100644 --- a/api/package.json +++ b/api/package.json @@ -4,7 +4,8 @@ "description": "Unified UI and API for processing and training images for facial recognition", "scripts": { "start": "node server.js", - "debug": "nodemon server.js" + "debug": "nodemon server.js", + "preinstall": "npm install better-sqlite3@'^7.5.3' --no-save --build-from-source --sqlite3=\"/src/sqlite\"" }, "repository": { "type": "git", @@ -21,7 +22,6 @@ "@mhoc/axios-digest-auth": "^0.8.0", "archiver": "^5.3.1", "axios": "^0.27.2", - "better-sqlite3": "^7.5.3", "canvas": "^2.9.1", "cors": "^2.8.5", "execution-time": "^1.4.1", From 80c1661432fc0f29bc03519fc5f6d2590bedb216 Mon Sep 17 00:00:00 2001 From: Sergey Krashevich Date: Wed, 4 Jan 2023 06:35:25 +0300 Subject: [PATCH 2/2] Update Dockerfile --- .build/Dockerfile | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.build/Dockerfile b/.build/Dockerfile index b915ab97..ae12395b 100644 --- a/.build/Dockerfile +++ b/.build/Dockerfile @@ -2,23 +2,28 @@ FROM ubuntu:20.04 as build ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y curl bash -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - -RUN apt-get install -y nodejs gcc g++ make libpixman-1-dev libcairo2-dev libpango1.0-dev libjpeg8-dev libgif-dev jq - -WORKDIR /src/sqlite -ADD https://github.com/WiseLibs/better-sqlite3/raw/v7.5.3/deps/sqlite3/sqlite3.c . -ADD https://github.com/WiseLibs/better-sqlite3/raw/v7.5.3/deps/sqlite3/sqlite3.h . -ADD https://github.com/WiseLibs/better-sqlite3/raw/v7.5.3/deps/sqlite3/sqlite3ext.h . - -RUN < sqlite3.c +apt-get update && apt-get install -y curl bash +curl -sL https://deb.nodesource.com/setup_16.x | bash - +apt-get install -y nodejs gcc g++ make libpixman-1-dev libcairo2-dev libpango1.0-dev libjpeg8-dev libgif-dev jq unzip wget EOT WORKDIR /double-take/api COPY /api/package.json . -RUN npm install --production -RUN curl -L https://gobinaries.com/tj/node-prune | /bin/sh && node-prune +RUN --mount=type=tmpfs,target=/src <