Skip to content

Commit 66eff30

Browse files
author
brady.ouren
committed
fix: include the root dockerfile for api
1 parent ad4b908 commit 66eff30

File tree

6 files changed

+76
-13
lines changed

6 files changed

+76
-13
lines changed

docker/devnet/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM rust:1.68-alpine as builder
1+
FROM --platform=$BUILDPLATFORM rust:1.68-alpine as clarinet-builder
22

33
ARG CLARINET_VERSION=v2.8.0
44
WORKDIR /usr/src/
@@ -9,16 +9,14 @@ RUN apk add --no-cache \
99
curl \
1010
pkgconfig
1111

12-
# building from source because I wasn't able to get the platform working from binary
12+
# Build Clarinet from source
1313
RUN git clone https://github.com/hirosystems/clarinet.git && \
1414
cd clarinet && \
15-
git checkout main && \
15+
git checkout 1bdc272 && \
1616
cargo build --release
1717

18-
# Final stage (using Docker-in-Docker)
1918
FROM --platform=$BUILDPLATFORM docker:dind
2019

21-
# Install necessary packages
2220
RUN apk add --no-cache \
2321
ca-certificates \
2422
docker \
@@ -31,8 +29,8 @@ RUN apk add --no-cache \
3129
# Add root to the docker group
3230
RUN usermod -aG docker root
3331

34-
# Copy Clarinet binary from builder stage
35-
COPY --from=builder /usr/src/clarinet/target/release/clarinet /usr/local/bin/clarinet
32+
# Copy Clarinet binary from builder image
33+
COPY --from=clarinet-builder /usr/src/clarinet/target/release/clarinet /usr/local/bin/clarinet
3634

3735
WORKDIR /app
3836

@@ -46,7 +44,6 @@ EXPOSE 20443
4644
EXPOSE 18443
4745
# Postgres
4846
EXPOSE 5490
49-
EXPOSE 5432
5047

5148
# Copy Clarinet config files
5249
COPY Clarinet.toml .
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Dockerfile.clarinet-builder
2+
3+
FROM --platform=$BUILDPLATFORM rust:1.68-alpine as builder
4+
5+
ARG CLARINET_VERSION=v2.8.0
6+
WORKDIR /usr/src/
7+
8+
RUN apk add --no-cache \
9+
git \
10+
build-base \
11+
curl \
12+
pkgconfig
13+
14+
# Build Clarinet from source
15+
RUN git clone https://github.com/hirosystems/clarinet.git && \
16+
cd clarinet && \
17+
git checkout 1bdc272 && \
18+
cargo build --release
19+
20+
# This image produces the built Clarinet binary

docker/devnet/docker-compose.yml

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
services:
2+
# clarinet-builder:
3+
# build:
4+
# context: .
5+
# dockerfile: Dockerfile.clarinet-builder
6+
# networks:
7+
# - backend
8+
29
clarinet-devnet:
10+
# depends_on:
11+
# - clarinet-builder
312
networks:
4-
- stacks
13+
- backend
514
restart: on-failure
615
build:
716
context: .
@@ -23,8 +32,34 @@ services:
2332
- 'host.docker.internal:host-gateway' # fixes `host.docker.internal` on linux hosts
2433
privileged: true
2534

35+
stacks-blockchain-api:
36+
build:
37+
context: ../..
38+
restart: on-failure
39+
environment:
40+
PG_HOST: postgres
41+
PG_PORT: 5490
42+
PG_USER: postgres
43+
PG_PASSWORD: postgres
44+
PG_DATABASE: stacks_blockchain_api
45+
STACKS_CORE_EVENT_PORT: 3700
46+
STACKS_CORE_EVENT_HOST: http://0.0.0.0
47+
STACKS_BLOCKCHAIN_API_PORT: 3999
48+
STACKS_BLOCKCHAIN_API_HOST: 0.0.0.0
49+
STACKS_CORE_RPC_HOST: stacks-blockchain
50+
STACKS_CORE_RPC_PORT: 20443
51+
NODE_ENV: development
52+
ports:
53+
- "3999:3999"
54+
- "9153:9153"
55+
volumes:
56+
- ../stacks-blockchain/:/app/config
57+
networks:
58+
- backend
59+
depends_on:
60+
- clarinet-devnet
2661

2762
networks:
28-
stacks:
63+
backend:
2964
volumes:
3065
chainstate:

docker/devnet/settings/Devnet.toml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ balance = 100_000_000_000_000
7676
use_docker_gateway_routing = true
7777
disable_stacks_explorer = true
7878
disable_stacks_api = true
79+
disable_postgres = false
7980
# disable_subnet_api = false
8081
disable_bitcoin_explorer = true
8182
# working_dir = "tmp/devnet"
@@ -100,8 +101,8 @@ stacks_api_events_port = 3700
100101
postgres_port = 5490
101102
# postgres_username = "postgres"
102103
# postgres_password = "postgres"
103-
postgres_database = "postgres"
104-
# postgres_database = "stacks_blockchain_api"
104+
# postgres_database = "postgres"
105+
postgres_database = "stacks_blockchain_api"
105106
# bitcoin_node_image_url = "quay.io/hirosystems/bitcoind:26.0"
106107
# stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-2.5"
107108
# stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-2.5"
@@ -122,6 +123,7 @@ postgres_database = "postgres"
122123
# subnet_api_postgres_database = "subnet_api"
123124

124125
# For testing in epoch 2.1 / using Clarity2
126+
# defaults
125127
# epoch_2_0 = 100
126128
# epoch_2_05 = 100
127129
# epoch_2_1 = 101
@@ -130,6 +132,14 @@ postgres_database = "postgres"
130132
# epoch_2_4 = 104
131133
# epoch_2_5 = 108
132134

135+
epoch_2_0 = 103
136+
epoch_2_05 = 104
137+
epoch_2_1 = 106
138+
epoch_2_2 = 108
139+
epoch_2_3 = 109
140+
epoch_2_4 = 111
141+
epoch_2_5 = 112
142+
epoch_3_0 = 132
133143

134144
# Send some stacking orders
135145
[[devnet.pox_stacking_orders]]

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- ../stacks-blockchain/:/app/config
5353
networks:
5454
- backend
55-
depends_on:
55+
depends_on:
5656
- postgres
5757

5858
networks:

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"migrate": "node-pg-migrate -m migrations",
5353
"devenv:build": "docker compose -f docker/devnet/docker-compose.yml build",
5454
"devenv:deploy": "docker compose -f docker/devnet/docker-compose.yml up --force-recreate -V",
55+
"devenv:stop": "docker compose -f docker/devnet/docker-compose.yml down -v -t 0",
5556
"devenv:deploy:subnets": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.subnets.yml up --force-recreate -V",
5657
"devenv:stop:subnets": "docker compose -f docker/docker-compose.dev.postgres.yml -f docker/docker-compose.dev.subnets.yml down -v -t 0",
5758
"devenv:deploy-krypton": "docker compose -f docker/devnet/docker-compose.yml up -d --force-recreate -V",

0 commit comments

Comments
 (0)