huanld/speckle-server
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update knex dependency chain (#776)

Browse Source 
* chore(root): update packages

* chore(server + preview service): add pg-query-stream peer dependency

* build(dockerfiles): unify and update docker base layer to latest node lts
This commit is contained in:
Gergő Jedlicska
2022-06-01 10:25:09 +02:00
committed by GitHub
parent 142219dc4c
commit 1d8ffac57a
10 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/fileimport-service/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:16.13-bullseye-slim as node
FROM node:16.15-bullseye-slim as node
RUN apt-get update && apt-get install -y \
python3 \
packages/fileimport-service/package.json
+2 -2
View File
@@ -25,9 +25,9 @@
"aws-sdk": "^2.1075.0",
"bcrypt": "^5.0.1",
"crypto-random-string": "^3.3.1",
"knex": "^1.0.3",
"knex": "^2.0.0",
"node-fetch": "^2.6.5",
"pg": "^8.7.1",
"pg": "^8.7.3",
"prom-client": "^14.0.1",
"valid-filename": "^3.1.0",
"web-ifc": "^0.0.33"
packages/frontend/Dockerfile
+1 -1
View File
@@ -1,7 +1,7 @@
# NOTE: Docker context should be set to git root directory, to include the viewer
# build stage
FROM node:16.13-bullseye-slim as build-stage
FROM node:16.15-bullseye-slim as build-stage
WORKDIR /speckle-server
COPY .yarnrc.yml .
packages/preview-service/Dockerfile
+4 -3
View File
@@ -2,7 +2,7 @@
# build stage
FROM node:14.16-buster-slim as build-stage
FROM node:16.15-buster-slim as build-stage
ARG NODE_ENV=production
ENV NODE_ENV=${NODE_ENV}
@@ -31,7 +31,7 @@ RUN yarn workspaces foreach -pt run build
FROM node:14.16-buster-slim as node
FROM node:16.15-bullseye-slim as node
RUN apt-get update && apt-get install -y \
tini \
@@ -39,7 +39,8 @@ RUN apt-get update && apt-get install -y \
# chromium dependencies
RUN apt-get update && apt-get install -y \
ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils \
# ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils \
ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcairo2 libcups2 libdbus-1-3 libdrm2 libexpat1 libgbm1 libglib2.0-0 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 wget xdg-utils \
&& rm -rf /var/lib/apt/lists/*
ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.8.0/wait /wait
packages/preview-service/package.json
+3 -3
View File
@@ -28,11 +28,11 @@
"file-type": "^16.3.0",
"http-errors": "~1.6.3",
"join-images": "^1.1.3",
"knex": "^1.0.3",
"knex": "^2.0.0",
"morgan": "~1.9.1",
"node-fetch": "^2.6.1",
"pg": "^8.6.0",
"pg-query-stream": "^4.1.0",
"pg": "^8.7.3",
"pg-query-stream": "^4.2.3",
"prom-client": "^14.0.1",
"puppeteer": "^13.3.2",
"sharp": "^0.30.5",
packages/server/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:16.13-bullseye-slim as node
FROM node:16.15-bullseye-slim as node
ARG NODE_ENV=production
ENV NODE_ENV=${NODE_ENV}
ARG SPECKLE_SERVER_VERSION=custom
packages/server/package.json
+3 -3
View File
@@ -50,7 +50,7 @@
"graphql-tag": "^2.11.0",
"graphql-tools": "^4.0.7",
"ioredis": "^4.19.4",
"knex": "^1.0.3",
"knex": "^2.0.0",
"lodash": "^4.17.21",
"module-alias": "^2.2.2",
"morgan": "^1.10.0",
@@ -62,8 +62,8 @@
"passport-github2": "^0.1.12",
"passport-google-oauth2": "^0.2.0",
"passport-google-oauth20": "^2.0.0",
"pg": "^8.5.1",
"pg-query-stream": "^4.2.1",
"pg": "^8.7.3",
"pg-query-stream": "^4.2.3",
"prom-client": "^14.0.1",
"redis": "^3.1.1",
"response-time": "^2.3.2",
packages/webhook-service/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:16.13-bullseye-slim as node
FROM node:16.15-bullseye-slim as node
RUN apt-get update && apt-get install -y \
tini \
packages/webhook-service/package.json
+2 -2
View File
@@ -21,9 +21,9 @@
"lint": "eslint . --ext .js,.ts"
},
"dependencies": {
"knex": "^1.0.3",
"knex": "^2.0.0",
"node-fetch": "^2.6.1",
"pg": "^8.6.0",
"pg": "^8.7.3",
"private-ip": "^2.3.3",
"prom-client": "^14.0.1"
},
yarn.lock
+18 -18
View File
@@ -2835,10 +2835,10 @@ __metadata:
crypto-random-string: ^3.3.1
eslint: ^8.11.0
eslint-config-prettier: ^8.5.0
knex: ^1.0.3
knex: ^2.0.0
node-fetch: ^2.6.5
nodemon: ^2.0.13
pg: ^8.7.1
pg: ^8.7.3
prettier: ^2.5.1
prom-client: ^14.0.1
valid-filename: ^3.1.0
@@ -2949,12 +2949,12 @@ __metadata:
html-webpack-plugin: ^5.3.1
http-errors: ~1.6.3
join-images: ^1.1.3
knex: ^1.0.3
knex: ^2.0.0
morgan: ~1.9.1
node-fetch: ^2.6.1
nodemon: ^2.0.7
pg: ^8.6.0
pg-query-stream: ^4.1.0
pg: ^8.7.3
pg-query-stream: ^4.2.3
prettier: ^2.5.1
prom-client: ^14.0.1
puppeteer: ^13.3.2
@@ -3016,7 +3016,7 @@ __metadata:
graphql-tools: ^4.0.7
http-proxy-middleware: ^1.0.6
ioredis: ^4.19.4
knex: ^1.0.3
knex: ^2.0.0
lodash: ^4.17.21
mocha: ^7.2.0
mocha-junit-reporter: ^2.0.2
@@ -3032,8 +3032,8 @@ __metadata:
passport-github2: ^0.1.12
passport-google-oauth2: ^0.2.0
passport-google-oauth20: ^2.0.0
pg: ^8.5.1
pg-query-stream: ^4.2.1
pg: ^8.7.3
pg-query-stream: ^4.2.3
prettier: ^2.5.1
prom-client: ^14.0.1
redis: ^3.1.1
@@ -3116,9 +3116,9 @@ __metadata:
cross-env: ^7.0.3
eslint: ^8.11.0
eslint-config-prettier: ^8.5.0
knex: ^1.0.3
knex: ^2.0.0
node-fetch: ^2.6.1
pg: ^8.6.0
pg: ^8.7.3
prettier: ^2.5.1
private-ip: ^2.3.3
prom-client: ^14.0.1
@@ -15290,9 +15290,9 @@ __metadata:
languageName: node
linkType: hard
"knex@npm:^1.0.3":
version: 1.0.7
resolution: "knex@npm:1.0.7"
"knex@npm:^2.0.0":
version: 2.0.0
resolution: "knex@npm:2.0.0"
dependencies:
colorette: 2.0.16
commander: ^9.1.0
@@ -15309,8 +15309,6 @@ __metadata:
tarn: ^3.0.2
tildify: 2.0.0
peerDependenciesMeta:
"@vscode/sqlite3":
optional: true
better-sqlite3:
optional: true
mysql:
@@ -15321,11 +15319,13 @@ __metadata:
optional: true
pg-native:
optional: true
sqlite3:
optional: true
tedious:
optional: true
bin:
knex: bin/cli.js
checksum: 57608a3a6813cb66da6f5a078016338166c53ab2cbaab66e81492352023db88fc158e4ad6bbd2156cd9d7c9cac14a4b1e581dd8232b4f9bab2285ea6f1efc5cf
checksum: c2b5bf0b511a2736310ffe59bfdccfa5721d95b8692c36ad085871f494cdfbe1817cc9c2521c0b1dda46b934b048bfd10675eaf93460fcc66476cca1b0af875f
languageName: node
linkType: hard
@@ -18675,7 +18675,7 @@ __metadata:
languageName: node
linkType: hard
"pg-query-stream@npm:^4.1.0, pg-query-stream@npm:^4.2.1":
"pg-query-stream@npm:^4.2.3":
version: 4.2.3
resolution: "pg-query-stream@npm:4.2.3"
dependencies:
@@ -18697,7 +18697,7 @@ __metadata:
languageName: node
linkType: hard
"pg@npm:^8.5.1, pg@npm:^8.6.0, pg@npm:^8.7.1":
"pg@npm:^8.7.3":
version: 8.7.3
resolution: "pg@npm:8.7.3"
dependencies: