From 8c6f78ac73f079bf83ab284159c5d28df90e183e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 13 Sep 2022 10:53:39 -0700 Subject: add docker internal host --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 49f143f0..a9c2c9ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,8 @@ services: volumes: - ./:/app - ./logs:/logs + extra_hosts: + - host.docker.internal:host-gateway networks: default: ipv4_address: 172.18.0.22 -- cgit v1.2.3 From d70c9adf3328b34946364b638a14f4816e05382d Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 14 Sep 2022 09:27:51 -0700 Subject: dev command --- docker-compose.yml | 3 ++- package.json | 4 ++-- prod.yml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index a9c2c9ea..2911eee1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,11 +5,12 @@ services: - app container_name: ui image: asoltys/coinos-ui:dev + command: ["pnpm", "dev"] ports: - '8085:8085' environment: NODE_ENV: development - # NODE_OPTIONS: --openssl-legacy-provider + NODE_OPTIONS: "--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js --openssl-legacy-provider" volumes: - ../coinos-ui:/app networks: diff --git a/package.json b/package.json index 518c2c1a..4e7030fa 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "0.0.1", "private": true, "scripts": { - "start": "NODE_OPTIONS=\"--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js --openssl-legacy-provider\" node index.js", - "dev": "NODE_OPTIONS=\"--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js --openssl-legacy-provider\" nodemon index.js" + "start": "node index.js", + "dev": "nodemon index.js" }, "dependencies": { "@fastify/multipart": "^7.1.2", diff --git a/prod.yml b/prod.yml index dcd0c449..ea600a18 100644 --- a/prod.yml +++ b/prod.yml @@ -9,6 +9,7 @@ services: - '3119:3119' environment: NODE_ENV: production + NODE_OPTIONS: "--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js --openssl-legacy-provider" volumes: - ./:/app - ./logs:/logs -- cgit v1.2.3 From cf5335d9a16dce15c1aac5a01febaa90a093729c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 14 Sep 2022 12:13:03 -0700 Subject: move env var to server container --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 2911eee1..391768e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: - '8085:8085' environment: NODE_ENV: development - NODE_OPTIONS: "--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js --openssl-legacy-provider" volumes: - ../coinos-ui:/app networks: @@ -28,6 +27,7 @@ services: - '3118:3118' - '3119:3119' environment: + NODE_OPTIONS: "--es-module-specifier-resolution=node --experimental-modules --loader ./loader.js --openssl-legacy-provider" NODE_ENV: development volumes: - ./:/app -- cgit v1.2.3 From 59d7dcd4f97a63c2d572f41c908b342114701dc4 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 14 Sep 2022 12:17:03 -0700 Subject: sampleconfig lnurl --- README.md | 2 +- docker-compose.yml | 4 ++-- sampleconfig/lnurl.js | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 sampleconfig/lnurl.js (limited to 'docker-compose.yml') diff --git a/README.md b/README.md index 0e49ee3c..743d2db1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ cp fx.sample fx docker network create net --gateway 172.18.0.1 --subnet 172.18.0.0/16 docker run -it -v $(pwd):/app --entrypoint pnpm asoltys/coinos-server i docker-compose up -d -docker exec -i mariadb mysql -u root -ppassword < db/schema.sql +docker exec -i maria mysql -u root -ppassword < db/schema.sql docker exec -it bitcoin bitcoin-cli createwallet coinos docker exec -it bitcoin bitcoin-cli rescanblockchain docker exec -it bitcoin bitcoin-cli generatetoaddress 500 $(docker exec -it bitcoin bitcoin-cli getnewaddress "" "p2sh-segwit") diff --git a/docker-compose.yml b/docker-compose.yml index 391768e9..6b430e35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,6 @@ services: - app container_name: ui image: asoltys/coinos-ui:dev - command: ["pnpm", "dev"] ports: - '8085:8085' environment: @@ -23,6 +22,7 @@ services: - lnd container_name: app image: gcr.io/coinos-326717/github.com/coinos/coinos-server:prod + command: ["pnpm", "dev"] ports: - '3118:3118' - '3119:3119' @@ -85,7 +85,7 @@ services: default: ipv4_address: 172.18.0.31 maria: - container_name: mariadb + container_name: maria image: mariadb:10.6.1 restart: always environment: diff --git a/sampleconfig/lnurl.js b/sampleconfig/lnurl.js new file mode 100644 index 00000000..6f358983 --- /dev/null +++ b/sampleconfig/lnurl.js @@ -0,0 +1,46 @@ +import fs from "fs"; + +export default { + host: "app", + port: 3118, + protocol: "http", + url: "https://desk.bobcat-liberty.ts.net", + endpoint: "/lnurl", + listen: true, + auth: { + apiKeys: [ + { + id: "50bdeb634d", + key: "ac9bdd15a983072311c74c13877d122f16a27a8f40cb4dfa5014eece4da5cda2" + } + ] + }, + lightning: { + backend: "lnd", + config: { + hostname: "lnd:9735", + cert: { + data: fs.readFileSync( + "/app/config/lnd/tls.cert", + "utf8" + ) + }, + macaroon: { + data: + "0201036c6e6402f801030a100a1edc729d77423ec23fa75b85b781391201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620aea455def2702fb1ec9838f1300255147ed20e825a539a1ee2e99e7049b04c11" + } + } + }, + store: { + backend: 'knex', + config: { + client: 'mysql', + connection: { + host: 'maria', + user: 'root', + password: 'password', + database: 'coinos', + }, + }, + }, +}; -- cgit v1.2.3