Skip to content

Commit cc57866

Browse files
author
brady.ouren
committed
chore(tests): update vscode task cmds
1 parent 2f9fa24 commit cc57866

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

.vscode/tasks.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "dedicated", "clear": false }
1616
},
1717
{
18-
"label": "stacks-node:start-mocknet",
18+
"label": "stacks-node:start-devnet",
1919
"type": "shell",
20-
"command": "docker compose -f docker/docker-compose.dev.stacks-blockchain.yml up --force-recreate -V",
20+
"command": "docker compose -f docker/devnet/docker-compose.yml up --force-recreate -V",
2121
"isBackground": true,
2222
"problemMatcher": {
2323
"pattern": { "regexp": ".", "file": 1, "location": 2, "message": 3, },
@@ -28,7 +28,7 @@
2828
{
2929
"label": "stacks-node:stop-mocknet",
3030
"type": "shell",
31-
"command": "docker compose -f docker/docker-compose.dev.stacks-blockchain.yml down -v -t 0",
31+
"command": "docker compose -f docker/devnet/docker-compose.yml down -v -t 0",
3232
"isBackground": true,
3333
"problemMatcher": {
3434
"pattern": { "regexp": ".", "file": 1, "location": 2, "message": 3, },
@@ -85,7 +85,7 @@
8585
{
8686
"label": "deploy:krypton",
8787
"type": "shell",
88-
"command": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-krypton.yml up --force-recreate -V",
88+
"command": "docker compose -f docker/devnet/docker-compose.yml up --force-recreate -V",
8989
"isBackground": true,
9090
"problemMatcher": {
9191
"pattern": { "regexp": ".", "file": 1, "location": 2, "message": 3 },
@@ -96,7 +96,7 @@
9696
{
9797
"label": "stop:krypton",
9898
"type": "shell",
99-
"command": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-krypton.yml down -v -t 0",
99+
"command": "docker compose -f docker/devnet/docker-compose.yml down -v -t 0",
100100
"presentation": {
101101
"echo": true,
102102
"reveal": "silent",

docker/devnet/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM --platform=$BUILDPLATFORM rust:1.68 as builder
2+
# FROM --platform=linux/amd64 rust:1.68 as builder
23

34
ARG CLARINET_VERSION=v2.8.0
45
WORKDIR /usr/src/clarinet
@@ -13,6 +14,7 @@ RUN git clone https://github.com/hirosystems/clarinet.git . && \
1314
cargo build --release
1415

1516
# Final stage (using Docker-in-Docker)
17+
# FROM --platform=linux/amd64 docker:dind
1618
FROM --platform=$BUILDPLATFORM docker:dind
1719

1820
# Install necessary packages
@@ -21,6 +23,7 @@ RUN apk add --no-cache \
2123
docker \
2224
sudo \
2325
net-tools \
26+
file \
2427
iproute2 \
2528
shadow
2629

docker/devnet/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ services:
1414
- chainstate:/chainstate
1515
environment:
1616
- CLARINET_VERSION=v2.8.0
17+
privileged: true
18+
1719

1820
networks:
1921
stacks:

docker/devnet/settings/Devnet.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ balance = 100_000_000_000_000
7373
# btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d
7474

7575
[devnet]
76-
disable_stacks_explorer = false
77-
disable_stacks_api = false
76+
disable_stacks_explorer = true
77+
disable_stacks_api = true
7878
# disable_subnet_api = false
7979
disable_bitcoin_explorer = true
8080
# working_dir = "tmp/devnet"
@@ -96,7 +96,7 @@ stacks_api_events_port = 3700
9696
# bitcoin_explorer_port = 8001
9797
# stacks_explorer_port = 8000
9898
# postgres_port = 5432
99-
postgres_port = 5490
99+
# postgres_port = 5490
100100
# postgres_username = "postgres"
101101
# postgres_password = "postgres"
102102
# postgres_database = "postgres"

docker/devnet/start.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
set -x # Enable debugging output
44

@@ -16,5 +16,7 @@ docker ps -a
1616
netstat -tuln | grep 18443
1717
netstat -tuln | grep 18453
1818

19+
mkdir /app/.cache
20+
1921
# Start Clarinet devnet
20-
clarinet devnet start --no-dashboard --manifest-path /app/Clarinet.toml
22+
/usr/local/bin/clarinet devnet start --no-dashboard --manifest-path /app/Clarinet.toml

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@
5050
"lint:prettier": "prettier --check src/**/*.{ts,json}",
5151
"lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx -f unix --fix && prettier --write --check src/**/*.{ts,json}",
5252
"migrate": "node-pg-migrate -m migrations",
53-
"devenv:build": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml -f docker/docker-compose.dev.rosetta-cli.yml build --no-cache",
54-
"devenv:deploy": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml up --force-recreate -V",
55-
"devenv:follower": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain-follower.yml up --force-recreate -V",
56-
"devenv:stop": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.stacks-blockchain.yml -f docker/docker-compose.dev.bitcoind.yml down -v -t 0",
53+
"devenv:build": "docker compose -f docker/devnet/docker-compose.yml build",
54+
"devenv:deploy": "docker compose -f docker/devnet/docker-compose.yml up --force-recreate -V",
5755
"devenv:deploy:subnets": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.subnets.yml up --force-recreate -V",
5856
"devenv:stop:subnets": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.subnets.yml down -v -t 0",
5957
"devenv:deploy-krypton": "docker compose -f docker/devnet/docker-compose.yml up -d --force-recreate -V",

0 commit comments

Comments
 (0)