chore: review clean up

hirosystems · Oct 15, 2024 · 972f395 · 972f395
1 parent 455bb36
commit 972f395
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/docker/devnet/Dockerfile b/docker/devnet/Dockerfile
@@ -1,6 +1,5 @@
-FROM --platform=$BUILDPLATFORM rust:1.68-alpine as clarinet-builder
+FROM --platform=$BUILDPLATFORM rust:alpine as clarinet-builder
 
-ARG CLARINET_VERSION=v2.8.0
 WORKDIR /usr/src/
 
 RUN apk add --no-cache \
@@ -12,7 +11,7 @@ RUN apk add --no-cache \
 # Build Clarinet from source
 RUN git clone https://github.com/hirosystems/clarinet.git && \
     cd clarinet && \
-    git checkout 1717a4e && \
+    git checkout main && \
     cargo build --release
 
 FROM --platform=$BUILDPLATFORM docker:dind

diff --git a/docker/devnet/Dockerfile.clarinet-builder b/docker/devnet/Dockerfile.clarinet-builder
@@ -1,8 +1,7 @@
 # Dockerfile.clarinet-builder
 
-FROM --platform=$BUILDPLATFORM rust:1.68-alpine as builder
+FROM --platform=$BUILDPLATFORM rust:alpine as builder
 
-ARG CLARINET_VERSION=v2.8.0
 WORKDIR /usr/src/
 
 RUN apk add --no-cache \
@@ -14,7 +13,7 @@ RUN apk add --no-cache \
 # Build Clarinet from source
 RUN git clone https://github.com/hirosystems/clarinet.git && \
     cd clarinet && \
-    git checkout 1bdc272 && \
+    git checkout main && \
     cargo build --release
 
 # This image produces the built Clarinet binary
diff --git a/docker/devnet/Makefile b/docker/devnet/Makefile
diff --git a/docker/devnet/deployments/default.devnet-plan.yaml b/docker/devnet/deployments/default.devnet-plan.yaml
@@ -3,6 +3,6 @@ id: 0
 name: Devnet deployment
 network: devnet
 stacks-node: "http://localhost:20443"
-bitcoin-node: "http://devnet:devnet@localhost:18453"
+bitcoin-node: "http://devnet:devnet@localhost:18443"
 plan:
   batches: []
diff --git a/docker/devnet/docker-compose.yml b/docker/devnet/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       context: .
       # platform: ${BUILDPLATFORM:-linux/amd64}
     ports:
-      - "3700:3700"
       - "20443:20443"
       - '20444:20444'
       - "18443:18443"
@@ -27,8 +26,6 @@ services:
       - ../stacks-blockchain/:/app/config
       - ../stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
     environment:
-      - CLARINET_VERSION=v2.8.0
-      - STACKS_EVENT_OBSERVER=host.docker.internal:3700
       - PG_DATABASE=stacks_api
     extra_hosts:
       - 'host.docker.internal:host-gateway' # fixes `host.docker.internal` on linux hosts

diff --git a/docker/devnet/settings/Devnet.toml b/docker/devnet/settings/Devnet.toml
@@ -80,7 +80,7 @@ disable_postgres = false
 # disable_subnet_api = false
 disable_bitcoin_explorer = true
 # working_dir = "tmp/devnet"
-stacks_node_events_observers = ["host.docker.internal:3700"]
+# stacks_node_events_observers = ["host.docker.internal:3700"]
 # miner_mnemonic = "fragile loan twenty basic net assault jazz absorb diet talk art shock innocent float punch travel gadget embrace caught blossom hockey surround initial reduce"
 # miner_derivation_path = "m/44'/5757'/0'/0/0"
 # faucet_mnemonic = "shadow private easily thought say logic fault paddle word top book during ignore notable orange flight clock image wealth health outside kitten belt reform"
@@ -94,7 +94,7 @@ bitcoin_node_password = "devnet"
 stacks_node_rpc_port = 20443
 # stacks_node_p2p_port = 20444
 # stacks_api_port = 3999
-stacks_api_events_port = 3700
+# stacks_api_events_port = 3700
 # bitcoin_explorer_port = 8001
 # stacks_explorer_port = 8000
 # postgres_port = 5432