Skip to content

Feat/node improvements #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 9, 2024
Merged

Feat/node improvements #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c05ebf7
Moves the docker file to the root level of monorepo to link with lib
ltardivo Oct 8, 2024
da044ad
Adds vite packages to .dockerignore
ltardivo Oct 8, 2024
1f40b7d
Moves Dockerfile to monorepo root level
ltardivo Oct 8, 2024
ea93559
Sets packages/node as working directory for docker
ltardivo Oct 8, 2024
1b9e858
Builds the node from monorepo
ltardivo Oct 8, 2024
2bf1220
Removes working_dir tag for bcn service at docker-compose file
ltardivo Oct 8, 2024
61e3461
Changes packages name in the bitcoin-computer scope
ltardivo Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ packages/nakamotojs/ts_src
packages/node/coverage/
packages/node/logs/
packages/node/node_modules/
packages/node/data/
packages/node/chain-setup/**/**/db-data
packages/node/chain-setup/**/**/blockchain-data
packages/node/.env
packages/node/.DS_Store
packages/node/src
Expand All @@ -30,13 +31,17 @@ packages/components
packages/cra-template
packages/docs
packages/explorer
packages/nft
packages/explorer-vite
packages/ft
packages/ft2
packages/nft
packages/nft-vite
packages/nodejs-template
packages/swap/
packages/TBC*/
packages/vite-template
packages/wallet
packages/wallet-vite
packages/website

.env
Expand Down
2 changes: 1 addition & 1 deletion packages/node/Dockerfile → Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN npm install --build-from-source
ENV PATH="/dist/node_modules/.bin:${PATH}"

# Set the working directory to "monorepo/packages/node"
WORKDIR /dist/packages/node
WORKDIR packages/node

# Expose the necessary port
EXPOSE 1031
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"packages/*"
],
"scripts": {
"build-node": "docker build -t bitcoin-computer-node .",
"check-obfuscation": "./scripts/check-obfuscation.sh",
"husky-checks": "./scripts/husky-checks.sh",
"prepare": "husky install",
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "explorer-vite",
"name": "@bitcoin-computer/explorer-vite",
"private": true,
"version": "0.21.0-beta.0",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/nft-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "nft-vite",
"name": "@bitcoin-computer/nft-vite",
"private": true,
"version": "0.21.0-beta.0",
"type": "module",
Expand Down
1 change: 0 additions & 1 deletion packages/node/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ services:
- BITCOIN_RPC_PASSWORD=${BITCOIN_RPC_PASSWORD}
- POSTGRES_PORT=${POSTGRES_PORT}
- POSTGRES_HOST=${POSTGRES_HOST}
working_dir: /dist
depends_on:
- db
- node
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "vite-project",
"name": "@bitcoin-computer/vite-project",
"private": true,
"version": "0.21.0-beta.0",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "wallet-vite",
"name": "@bitcoin-computer/wallet-vite",
"private": true,
"version": "0.21.0-beta.0",
"type": "module",
Expand Down