From 1e397724a0de7d5db4111eee7a1baeef17a2d86e Mon Sep 17 00:00:00 2001 From: Gonzalo Javier Aune Date: Mon, 1 Jun 2020 12:26:22 +0100 Subject: [PATCH 1/5] Freezing versions --- Dockerfile | 15 +++++---------- package.json | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d4a895..68e739d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN cd /go/src/github.com/lightningnetwork/lnd \ && make install tags="signrpc walletrpc chainrpc invoicesrpc experimental" # Start a new, final image. -FROM alpine as final +FROM alpine:3.11 as final EXPOSE 80 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/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/ @@ -46,19 +46,14 @@ ARG sphinx_checkout="master" RUN git checkout $sphinx_checkout -RUN npm install -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 libmcrypt-dev -RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git curl +RUN npm install RUN npm install --quiet node-gyp -g - RUN npm install sqlite3 --build-from-source --save-dev -RUN npm install --save-dev sequelize +RUN npm install --save-dev sequelize@5.19.3 RUN npm rebuild RUN npm run tsc -RUN npm cache clean --force VOLUME /relay/.lnd diff --git a/package.json b/package.json index c64448c..67d71c2 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "secp256k1": "^4.0.1", "semantic-ui-css": "^2.4.1", "semantic-ui-react": "^0.88.1", - "sequelize": "^5.19.3", + "sequelize": "5.19.3", "sequelize-cli": "^5.5.1", "sequelize-typescript": "^1.1.0", "short-uuid": "^3.1.1", From 4ea0e488da3648f367ad62d01329f4fef195225d Mon Sep 17 00:00:00 2001 From: Gonzalo Javier Aune Date: Mon, 1 Jun 2020 17:12:03 +0100 Subject: [PATCH 2/5] Trying with lower version of sqlite3 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index cddf68b..3fc5d9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10264,13 +10264,14 @@ "dev": true }, "sqlite3": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz", - "integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz", + "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==", "dev": true, "requires": { "nan": "^2.12.1", - "node-pre-gyp": "^0.11.0" + "node-pre-gyp": "^0.11.0", + "request": "^2.87.0" } }, "sshpk": { diff --git a/package.json b/package.json index 67d71c2..d91eafa 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "node-sass": "^4.14.1", "nodemon": "^2.0.1", "sass-loader": "^8.0.0", - "sqlite3": "^4.2.0", + "sqlite3": "4.1.1", "style-loader": "^1.0.0", "webpack": "^4.41.0", "webpack-cli": "^3.3.9", From 5ce54132859c6bf921f077d79823ebd40b60b85b Mon Sep 17 00:00:00 2001 From: Gonzalo Javier Aune Date: Mon, 1 Jun 2020 18:22:29 +0100 Subject: [PATCH 3/5] Going back to 4.2.0 --- Dockerfile | 10 +++++++--- package-lock.json | 9 ++++----- package.json | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68e739d..8b336b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,10 +48,14 @@ RUN git checkout $sphinx_checkout RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git curl libmcrypt-dev +RUN npm -g config set user root + RUN npm install -RUN npm install --quiet node-gyp -g -RUN npm install sqlite3 --build-from-source --save-dev -RUN npm install --save-dev sequelize@5.19.3 +RUN npm install --quiet node-gyp@0.12.0 -g +RUN npm install nw-gyp -g +RUN npm install sqlite3@4.2.0 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 +RUN npm uninstall sqlite3@4.2.0 +RUN npm install sqlite3@4.2.0 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 RUN npm rebuild RUN npm run tsc diff --git a/package-lock.json b/package-lock.json index 3fc5d9a..cddf68b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10264,14 +10264,13 @@ "dev": true }, "sqlite3": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz", - "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz", + "integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==", "dev": true, "requires": { "nan": "^2.12.1", - "node-pre-gyp": "^0.11.0", - "request": "^2.87.0" + "node-pre-gyp": "^0.11.0" } }, "sshpk": { diff --git a/package.json b/package.json index d91eafa..bdf19e7 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "node-sass": "^4.14.1", "nodemon": "^2.0.1", "sass-loader": "^8.0.0", - "sqlite3": "4.1.1", + "sqlite3": "4.2.0", "style-loader": "^1.0.0", "webpack": "^4.41.0", "webpack-cli": "^3.3.9", From 3c9153345d5b74de9d9ed9978266451d091b4150 Mon Sep 17 00:00:00 2001 From: Gonzalo Javier Aune Date: Mon, 1 Jun 2020 18:40:52 +0100 Subject: [PATCH 4/5] Going back to 4.1.1 --- Dockerfile | 6 +++--- package-lock.json | 9 +++++---- package.json | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b336b6..7404b8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,9 +53,9 @@ RUN npm -g config set user root RUN npm install RUN npm install --quiet node-gyp@0.12.0 -g RUN npm install nw-gyp -g -RUN npm install sqlite3@4.2.0 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 -RUN npm uninstall sqlite3@4.2.0 -RUN npm install sqlite3@4.2.0 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 +RUN npm install sqlite3@4.1.1 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 +RUN npm uninstall sqlite3@4.1.1 +RUN npm install sqlite3@4.1.1 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 RUN npm rebuild RUN npm run tsc diff --git a/package-lock.json b/package-lock.json index cddf68b..3fc5d9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10264,13 +10264,14 @@ "dev": true }, "sqlite3": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz", - "integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz", + "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==", "dev": true, "requires": { "nan": "^2.12.1", - "node-pre-gyp": "^0.11.0" + "node-pre-gyp": "^0.11.0", + "request": "^2.87.0" } }, "sshpk": { diff --git a/package.json b/package.json index bdf19e7..d91eafa 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "node-sass": "^4.14.1", "nodemon": "^2.0.1", "sass-loader": "^8.0.0", - "sqlite3": "4.2.0", + "sqlite3": "4.1.1", "style-loader": "^1.0.0", "webpack": "^4.41.0", "webpack-cli": "^3.3.9", From 41639cb2ac65387bcfb656ac3cb6aa5519621e49 Mon Sep 17 00:00:00 2001 From: Gonzalo Javier Aune Date: Mon, 1 Jun 2020 19:14:31 +0100 Subject: [PATCH 5/5] Changes in Dockerfile --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7404b8b..b2c6d98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,14 +48,17 @@ RUN git checkout $sphinx_checkout RUN apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python jq git curl libmcrypt-dev -RUN npm -g config set user root +USER root +RUN rm -rf node_modules/ RUN npm install -RUN npm install --quiet node-gyp@0.12.0 -g +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 install sqlite3@4.1.1 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 -RUN npm uninstall sqlite3@4.1.1 -RUN npm install sqlite3@4.1.1 --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 uninstall sqlite3 +RUN npm install sqlite3 --build-from-source --runtime=node-webkit --target_arch=x64 --target=0.42.0 RUN npm rebuild RUN npm run tsc