ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-22 06:57:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Link sqlite with a system sqlite for quicker builds

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2020-04-08 09:36:07 +01:00 committed by Balena CI
parent 2dfcbd6c69
commit b6dde69c4f
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Dockerfile
View File

@ -30,7 +30,9 @@ RUN apk add --no-cache \
binutils \ binutils \
libgcc \ libgcc \
libstdc++ \ libstdc++ \
libuv libuv \
sqlite-libs \
sqlite-dev
COPY build-conf/node-sums.txt . COPY build-conf/node-sums.txt .
@ -43,7 +45,7 @@ RUN curl -SLO "${NODE_LOCATION}" \
COPY package*.json ./ COPY package*.json ./
RUN npm ci RUN npm ci --build-from-source --sqlite=/usr/lib
# TODO: Once we support live copies and live runs, convert # TODO: Once we support live copies and live runs, convert
# these # these
@ -62,23 +64,23 @@ RUN npm run test-nolint \
# Run the production install here, to avoid the npm dependency on # Run the production install here, to avoid the npm dependency on
# the later stage # the later stage
RUN npm ci --production --no-optional --unsafe-perm \ RUN npm ci --production --no-optional --unsafe-perm --build-from-source --sqlite=/usr/lib \
&& npm cache clean --force \ && npm cache clean --force \
# For some reason this doesn't get cleared with the other # For some reason this doesn't get cleared with the other
# cache # cache
&& rm -rf node_modules/.cache \ && rm -rf node_modules/.cache \
# Remove various uneeded filetypes in order to reduce space # Remove various uneeded filetypes in order to reduce space
# We also remove the spurious node.dtps, see https://github.com/mapbox/node-sqlite3/issues/861 # We also remove the spurious node.dtps, see https://github.com/mapbox/node-sqlite3/issues/861
&& find . -path '*/coverage/*' -o -path '*/test/*' -o -path '*/.nyc_output/*' \ && find . -path '*/coverage/*' -o -path '*/test/*' -o -path '*/.nyc_output/*' \
-o -name '*.tar.*' -o -name '*.in' -o -name '*.cc' \ -o -name '*.tar.*' -o -name '*.in' -o -name '*.cc' \
-o -name '*.c' -o -name '*.coffee' -o -name '*.eslintrc' \ -o -name '*.c' -o -name '*.coffee' -o -name '*.eslintrc' \
-o -name '*.h' -o -name '*.html' -o -name '*.markdown' \ -o -name '*.h' -o -name '*.html' -o -name '*.markdown' \
-o -name '*.md' -o -name '*.patch' -o -name '*.png' \ -o -name '*.md' -o -name '*.patch' -o -name '*.png' \
-o -name '*.yml' -o -name "*.ts" \ -o -name '*.yml' -o -name "*.ts" \
-delete \ -delete \
&& find . -type f -path '*/node_modules/sqlite3/deps*' -delete \ && find . -type f -path '*/node_modules/sqlite3/deps*' -delete \
&& find . -type f -path '*/node_modules/knex/build*' -delete \ && find . -type f -path '*/node_modules/knex/build*' -delete \
&& rm -rf node_modules/sqlite3/node.dtps && rm -rf node_modules/sqlite3/node.dtps
# RUN ["cross-build-end"] # RUN ["cross-build-end"]
@ -95,7 +97,8 @@ RUN apk add --no-cache \
rsync \ rsync \
avahi \ avahi \
dbus \ dbus \
libstdc++ libstdc++ \
sqlite-libs
WORKDIR /usr/src/app WORKDIR /usr/src/app