Skip to content

Commit ad4b908

Browse files
author
brady.ouren
committed
fix(): daemon blocking and add docker host fix
1 parent a8fc5bd commit ad4b908

File tree

4 files changed

+23
-32
lines changed

4 files changed

+23
-32
lines changed

docker/devnet/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM --platform=$BUILDPLATFORM rust:1.68-alpine as builder
22

33
ARG CLARINET_VERSION=v2.8.0
4-
WORKDIR /usr/src/clarinet
4+
WORKDIR /usr/src/
55

66
RUN apk add --no-cache \
77
git \
@@ -32,7 +32,7 @@ RUN apk add --no-cache \
3232
RUN usermod -aG docker root
3333

3434
# Copy Clarinet binary from builder stage
35-
COPY --from=builder /usr/src/clarinet/clarinet/target/release/clarinet /usr/local/bin/clarinet
35+
COPY --from=builder /usr/src/clarinet/target/release/clarinet /usr/local/bin/clarinet
3636

3737
WORKDIR /app
3838

docker/devnet/settings/Devnet.toml

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

7575
[devnet]
76+
use_docker_gateway_routing = true
7677
disable_stacks_explorer = true
7778
disable_stacks_api = true
7879
# disable_subnet_api = false
@@ -99,7 +100,8 @@ stacks_api_events_port = 3700
99100
postgres_port = 5490
100101
# postgres_username = "postgres"
101102
# postgres_password = "postgres"
102-
# postgres_database = "postgres"
103+
postgres_database = "postgres"
104+
# postgres_database = "stacks_blockchain_api"
103105
# bitcoin_node_image_url = "quay.io/hirosystems/bitcoind:26.0"
104106
# stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-2.5"
105107
# stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-2.5"

docker/devnet/start.sh

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,11 @@
22

33
set -x # Enable debugging output
44

5-
# Clean up existing network and containers
6-
docker network rm devnet.devnet || true
7-
docker rm -f $(docker ps -a -q --filter name=devnet.devnet) || true
5+
sh -c dockerd-entrypoint.sh &
86

9-
# List existing networks and containers
10-
echo "Existing networks:"
11-
docker network ls
12-
echo "Existing containers:"
13-
docker ps -a
14-
15-
16-
netstat -tuln | grep 18443
17-
netstat -tuln | grep 18453
18-
19-
mkdir /app/.cache
20-
21-
# Start Clarinet devnet
22-
sh -c dockerd-entrypoint.sh
7+
until [ -S /var/run/docker.sock ]; do
8+
echo "Waiting for Docker to start..."
9+
sleep 1
10+
done
11+
echo "starting clarinet devnet"
2312
/usr/local/bin/clarinet devnet start --no-dashboard --manifest-path /app/Clarinet.toml

src/datastore/connection.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ export function getPgConnectionEnvValue(
2626
}
2727

2828
export function getConnectionArgs(server: PgServer = PgServer.default): PgConnectionArgs {
29-
return (
30-
getPgConnectionEnvValue('CONNECTION_URI', server) ?? {
31-
database: getPgConnectionEnvValue('DATABASE', server),
32-
user: getPgConnectionEnvValue('USER', server),
33-
password: getPgConnectionEnvValue('PASSWORD', server),
34-
host: getPgConnectionEnvValue('HOST', server),
35-
port: parseInt(getPgConnectionEnvValue('PORT', server) ?? '5432'),
36-
ssl: getPgConnectionEnvValue('SSL', server) == 'true',
37-
schema: getPgConnectionEnvValue('SCHEMA', server),
38-
application_name: getPgConnectionEnvValue('APPLICATION_NAME', server),
39-
}
40-
);
29+
const conn = getPgConnectionEnvValue('CONNECTION_URI', server) ?? {
30+
database: getPgConnectionEnvValue('DATABASE', server),
31+
user: getPgConnectionEnvValue('USER', server),
32+
password: getPgConnectionEnvValue('PASSWORD', server),
33+
host: getPgConnectionEnvValue('HOST', server),
34+
port: parseInt(getPgConnectionEnvValue('PORT', server) ?? '5432'),
35+
ssl: getPgConnectionEnvValue('SSL', server) == 'true',
36+
schema: getPgConnectionEnvValue('SCHEMA', server),
37+
application_name: getPgConnectionEnvValue('APPLICATION_NAME', server),
38+
};
39+
console.log(conn);
40+
return conn;
4141
}
4242

4343
export function getConnectionConfig(server: PgServer = PgServer.default): PgConnectionOptions {

0 commit comments

Comments
 (0)