Browse Source

Merge pull request #42 from stakwork/bugfix/sqlite-sequelize-versions

Bugfix sqlite sequelize versions
feature/dockerfile-arm
Evan Feenstra 4 years ago
committed by GitHub
parent
commit
8136e96363
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 24
      Dockerfile
  2. 9
      package-lock.json
  3. 4
      package.json

24
Dockerfile

@ -21,7 +21,7 @@ RUN cd /go/src/github.com/lightningnetwork/lnd \
&& make install tags="signrpc walletrpc chainrpc invoicesrpc experimental" && make install tags="signrpc walletrpc chainrpc invoicesrpc experimental"
# Start a new, final image. # Start a new, final image.
FROM alpine as final FROM alpine:3.11 as final
EXPOSE 80 EXPOSE 80
EXPOSE 9735 EXPOSE 9735
@ -36,7 +36,7 @@ RUN apk --no-cache add bash ca-certificates
COPY --from=builder /go/bin/lncli /bin/ COPY --from=builder /go/bin/lncli /bin/
COPY --from=builder /go/bin/lnd /bin/ COPY --from=builder /go/bin/lnd /bin/
RUN apk add --no-cache --update nodejs nodejs-npm sqlite git supervisor RUN apk add --no-cache --update nodejs=12.15.0-r1 nodejs-npm=12.15.0-r1 sqlite=3.30.1-r2 git supervisor
RUN git clone https://github.com/stakwork/sphinx-relay /relay/ RUN git clone https://github.com/stakwork/sphinx-relay /relay/
@ -46,19 +46,21 @@ ARG sphinx_checkout="master"
RUN git checkout $sphinx_checkout RUN git checkout $sphinx_checkout
RUN npm install RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git curl libmcrypt-dev
RUN npm install nodemon --save-dev
RUN npm install express --save-dev
RUN npm install webpack webpack-cli --save-dev
RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git curl USER root
RUN npm install --quiet node-gyp -g
RUN npm install sqlite3 --build-from-source --save-dev RUN rm -rf node_modules/
RUN npm install --save-dev sequelize RUN npm install
RUN npm install --quiet node-gyp@3.8.0 -g
RUN npm -g config set user root
RUN npm install nw-gyp -g
RUN npm uninstall sqlite3
RUN npm install sqlite3 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0
RUN npm uninstall sqlite3
RUN npm install sqlite3 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0
RUN npm rebuild RUN npm rebuild
RUN npm run tsc RUN npm run tsc
RUN npm cache clean --force
VOLUME /relay/.lnd VOLUME /relay/.lnd

9
package-lock.json

@ -10277,13 +10277,14 @@
"dev": true "dev": true
}, },
"sqlite3": { "sqlite3": {
"version": "4.2.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz", "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz",
"integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==", "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==",
"dev": true, "dev": true,
"requires": { "requires": {
"nan": "^2.12.1", "nan": "^2.12.1",
"node-pre-gyp": "^0.11.0" "node-pre-gyp": "^0.11.0",
"request": "^2.87.0"
} }
}, },
"sshpk": { "sshpk": {

4
package.json

@ -70,7 +70,7 @@
"secp256k1": "^4.0.1", "secp256k1": "^4.0.1",
"semantic-ui-css": "^2.4.1", "semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^0.88.1", "semantic-ui-react": "^0.88.1",
"sequelize": "^5.19.3", "sequelize": "5.19.3",
"sequelize-cli": "^5.5.1", "sequelize-cli": "^5.5.1",
"sequelize-typescript": "^1.1.0", "sequelize-typescript": "^1.1.0",
"short-uuid": "^3.1.1", "short-uuid": "^3.1.1",
@ -92,7 +92,7 @@
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"nodemon": "^2.0.1", "nodemon": "^2.0.1",
"sass-loader": "^8.0.0", "sass-loader": "^8.0.0",
"sqlite3": "^4.2.0", "sqlite3": "4.1.1",
"style-loader": "^1.0.0", "style-loader": "^1.0.0",
"webpack": "^4.41.0", "webpack": "^4.41.0",
"webpack-cli": "^3.3.9", "webpack-cli": "^3.3.9",

Loading…
Cancel
Save