From ebfd3f433a95378f713d82f21a93fe23882f1356 Mon Sep 17 00:00:00 2001 From: Taranto Date: Wed, 4 May 2022 22:24:52 +0100 Subject: [PATCH] chore: build fixes --- Dockerfiles/server.Dockerfile | 3 ++- bin/convert-txs.js | 1 + bin/lamassu-configure-frontcamera | 1 + bin/lamassu-eth-recovery | 1 + bin/lamassu-migrate | 5 +---- bin/lamassu-mnemonic | 1 + bin/lamassu-ofac-update-sources | 1 + bin/lamassu-operator | 1 + bin/lamassu-register | 1 + bin/migrate-config.js | 1 + bin/old-lamassu-register | 1 + lib/app.js | 1 + lib/graphql/resolvers.js | 1 - lib/new-admin/admin-server.js | 1 + lib/new-admin/graphql-dev-insecure.js | 1 + new-lamassu-admin/.env | 2 +- 16 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Dockerfiles/server.Dockerfile b/Dockerfiles/server.Dockerfile index 3e39e6fe..c175b511 100644 --- a/Dockerfiles/server.Dockerfile +++ b/Dockerfiles/server.Dockerfile @@ -22,6 +22,7 @@ WORKDIR /app COPY bin/ packages/lamassu-server/bin COPY lib/ packages/lamassu-server/lib +COPY data/ packages/lamassu-server/data COPY tools/ packages/lamassu-server/tools COPY migrations/ packages/lamassu-server/migrations COPY package.json packages/lamassu-server/package.json @@ -58,4 +59,4 @@ WORKDIR /app/packages/lamassu-server EXPOSE 3000 -ENTRYPOINT [ "/app/packages/lamassu-server/bin/lamassu-server-entrypoint.sh" ] \ No newline at end of file +ENTRYPOINT [ "/app/packages/lamassu-server/bin/lamassu-server-entrypoint.sh" ] diff --git a/bin/convert-txs.js b/bin/convert-txs.js index 658381ef..a972338d 100755 --- a/bin/convert-txs.js +++ b/bin/convert-txs.js @@ -1,6 +1,7 @@ #!/usr/bin/env node const path = require('path') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) var pgp = require('pg-promise')() diff --git a/bin/lamassu-configure-frontcamera b/bin/lamassu-configure-frontcamera index 910db546..b2e3a67f 100755 --- a/bin/lamassu-configure-frontcamera +++ b/bin/lamassu-configure-frontcamera @@ -3,6 +3,7 @@ 'use strict' const path = require('path') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) const setEnvVariable = require('../tools/set-env-var') diff --git a/bin/lamassu-eth-recovery b/bin/lamassu-eth-recovery index aeedde67..ee4d2964 100644 --- a/bin/lamassu-eth-recovery +++ b/bin/lamassu-eth-recovery @@ -10,6 +10,7 @@ const mnemonicHelpers = require('../lib/mnemonic-helpers') const pify = require('pify') const fs = pify(require('fs')) +const os = require('os') const MNEMONIC_PATH = process.env.MNEMONIC_PATH diff --git a/bin/lamassu-migrate b/bin/lamassu-migrate index 5e62218a..9e5bb307 100755 --- a/bin/lamassu-migrate +++ b/bin/lamassu-migrate @@ -1,10 +1,7 @@ #!/usr/bin/env node const _ = require('lodash/fp') const path = require('path') -require('dotenv').config({ path: path.resolve(__dirname, '../.env') }) - -const _ = require('lodash/fp') -const path = require('path') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) const db = require('../lib/db') diff --git a/bin/lamassu-mnemonic b/bin/lamassu-mnemonic index 3e655ef2..64712d59 100755 --- a/bin/lamassu-mnemonic +++ b/bin/lamassu-mnemonic @@ -1,6 +1,7 @@ #!/usr/bin/env node const fs = require('fs') +const os = require('os') const path = require('path') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) diff --git a/bin/lamassu-ofac-update-sources b/bin/lamassu-ofac-update-sources index 786fd35c..3fc309b5 100755 --- a/bin/lamassu-ofac-update-sources +++ b/bin/lamassu-ofac-update-sources @@ -2,6 +2,7 @@ 'use strict' +const os = require('os') const setEnvVariable = require('../tools/set-env-var') const path = require('path') diff --git a/bin/lamassu-operator b/bin/lamassu-operator index bedf170c..c4fe097a 100644 --- a/bin/lamassu-operator +++ b/bin/lamassu-operator @@ -2,6 +2,7 @@ const fs = require('fs') const hkdf = require('futoin-hkdf') +const os = require('os') const path = require('path') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) diff --git a/bin/lamassu-register b/bin/lamassu-register index 542f9ef8..c35b1f8a 100755 --- a/bin/lamassu-register +++ b/bin/lamassu-register @@ -1,6 +1,7 @@ #!/usr/bin/env node const path = require('path') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) const { asyncLocalStorage, defaultStore } = require('../lib/async-storage') const userManagement = require('../lib/new-admin/graphql/modules/userManagement') diff --git a/bin/migrate-config.js b/bin/migrate-config.js index 5d486ef8..7d864618 100644 --- a/bin/migrate-config.js +++ b/bin/migrate-config.js @@ -4,6 +4,7 @@ const pgp = require('pg-promise')() +const os = require('os') const path = require('path') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) diff --git a/bin/old-lamassu-register b/bin/old-lamassu-register index 3da5a9f4..25b6daea 100755 --- a/bin/old-lamassu-register +++ b/bin/old-lamassu-register @@ -1,6 +1,7 @@ #!/usr/bin/env node const path = require('path') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) const login = require('../lib/admin/login') diff --git a/lib/app.js b/lib/app.js index 07e90abd..c6ea5a61 100644 --- a/lib/app.js +++ b/lib/app.js @@ -3,6 +3,7 @@ const path = require('path') const http = require('http') const https = require('https') const argv = require('minimist')(process.argv.slice(2)) +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) diff --git a/lib/graphql/resolvers.js b/lib/graphql/resolvers.js index f5e4fc7d..d68bc8ce 100644 --- a/lib/graphql/resolvers.js +++ b/lib/graphql/resolvers.js @@ -1,7 +1,6 @@ const _ = require('lodash/fp') const nmd = require('nano-markdown') -const { accounts: accountsConfig, countries, languages } = require('../new-admin/config') const plugins = require('../plugins') const configManager = require('../new-config-manager') const { batchGetCustomInfoRequest, getCustomInfoRequests } = require('../new-admin/services/customInfoRequests') diff --git a/lib/new-admin/admin-server.js b/lib/new-admin/admin-server.js index e0979456..b3e9c0af 100644 --- a/lib/new-admin/admin-server.js +++ b/lib/new-admin/admin-server.js @@ -11,6 +11,7 @@ const cookieParser = require('cookie-parser') const { graphqlUploadExpress } = require('graphql-upload') const { ApolloServer } = require('apollo-server-express') const _ = require('lodash/fp') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../../.env') }) diff --git a/lib/new-admin/graphql-dev-insecure.js b/lib/new-admin/graphql-dev-insecure.js index c8468208..872b70a0 100644 --- a/lib/new-admin/graphql-dev-insecure.js +++ b/lib/new-admin/graphql-dev-insecure.js @@ -1,6 +1,7 @@ const express = require('express') const path = require('path') const { ApolloServer } = require('apollo-server-express') +const os = require('os') require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') }) diff --git a/new-lamassu-admin/.env b/new-lamassu-admin/.env index 81016f7c..153fab2c 100644 --- a/new-lamassu-admin/.env +++ b/new-lamassu-admin/.env @@ -2,4 +2,4 @@ SKIP_PREFLIGHT_CHECK=true HTTPS=true REACT_APP_TYPE_CHECK_SANCTUARY=false PORT=3001 -REACT_APP_BUILD_TARGET=PAZUZ \ No newline at end of file +REACT_APP_BUILD_TARGET=LAMASSU