Skip to content

Commit

Permalink
Merge pull request #707 from Digital-Engineering/development
Browse files Browse the repository at this point in the history
1.6.4
  • Loading branch information
browjm4 authored and GitHub Enterprise committed Jul 2, 2024
2 parents e13f36b + 007dfb4 commit e969bfa
Show file tree
Hide file tree
Showing 8 changed files with 2,084 additions and 13,941 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV RUN_JOBS=false
ENV CORE_DB_CONNECTION_STRING=postgresql://postgres:root@postgres:5432/deep_lynx_dev

RUN apk update
RUN apk add build-base musl-dev openssl-dev
RUN apk add build-base musl-dev openssl=3.3.1-r1 openssl-dev=3.3.1-r1
RUN apk update add --update nodejs=21.7.3
RUN apk add --update npm
RUN npm config set strict-ssl false
Expand All @@ -47,7 +47,7 @@ RUN yarn run build;
FROM node:alpine3.20 as production
ENV DEVELOPMENT_MODE=false

RUN apk update && apk add supervisor
RUN apk update && apk add supervisor openssl=3.3.1-r1
RUN mkdir -p /srv/deeplynx/server

# need pm2 to run legacy server
Expand Down
13,866 changes: 865 additions & 13,001 deletions server/package-lock.json

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"monocle-ts": "^2.3.11",
"newtype-ts": "^0.3.4",
"node-rsa": "^1.1.1",
"nodemon": "^2.0.7",
"nodemon": "^3.1.4",
"nyc": "^15.1.0",
"prettier": "2.3.1",
"run-script-os": "^1.1.5",
Expand All @@ -107,11 +107,13 @@
"@types/pg-copy-streams": "^1.2.5",
"@types/pg-large-object": "^2.0.5",
"@vue/cli-service": "^5.0.8",
"@vue/component-compiler-utils": "^3.3.0",
"amqplib": "^0.8.0",
"axios": "^1.7.2",
"base64url": "^3.0.1",
"bcryptjs": "^2.4.3",
"body-parser": "^1.19.0",
"braces": "^3.0.3",
"bree": "^9.1.2",
"buffer": "^6.0.3",
"build-url": "^6.0.1",
Expand Down Expand Up @@ -173,15 +175,17 @@
"pg-format": "^1.0.4",
"pg-large-object": "^2.0.0",
"pg-query-stream": "^4.2.1",
"postcss": "^8.4.38",
"postcss": "^8.4.31",
"reflect-metadata": "^0.1.13",
"semver": "^7.6.2",
"semver": "^7.5.2",
"short-uuid": "^4.2.0",
"simple-update-notifier": "^2.0.0",
"tslib": "^2.3.0",
"uid-generator": "^2.0.0",
"uuid-random": "^1.3.2",
"validator": "^13.5.2",
"ws": "^8.9.0",
"vue-loader": "^17.4.2",
"ws": "^8.17.1",
"xml-2-json-streaming": "^0.1.2",
"xml-crypto": "^2.1.1",
"xml-js": "^1.6.11",
Expand Down
Loading

0 comments on commit e969bfa

Please sign in to comment.