Skip to content

Commit

Permalink
chore: use v0.1.0-rc3 git tag for docker and nix fedimint deps
Browse files Browse the repository at this point in the history
  • Loading branch information
justinmoon authored and wbobeirne committed Aug 29, 2023
1 parent 5bc5054 commit 4c1fcf9
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 42 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,12 @@ The `guardian-ui-1` and `guardian-ui-2` are instances of `guardian-ui` apps, eac
The `gateway-ui` is an instance of `gateway-ui` app, connected to a `gatewayd` server instance (running in the `start-servers` process).

You can see more details by viewing the `mprocs.yml` file.

### Running with local Fedimint

If you would like to run the UIs against changes you have made to fedimint itself:

1. Run `cargo build` in fedimint
2. Run `env DEVIMINT_PATH=../fedimint/target/debug yarn nix-guardian` (aassuming that you have `ui` and `fedimint` repos checked out in the same directory)

This will put binaries in `fedimint/target/debug` at the front of your `$PATH`. Devimint will use these binaries instead of the ones installed via Nix.
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
fedimintd_1:
image: fedimint/fedimintd:6bc6ba15eb1cf8d67a009af5663468b01db8756f
image: fedimint/fedimintd:v0.1.0-rc3
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18173
Expand All @@ -19,7 +19,7 @@ services:
- bitcoind

gatewayd_1:
image: fedimint/gatewayd:6bc6ba15eb1cf8d67a009af5663468b01db8756f
image: fedimint/gatewayd:v0.1.0-rc3
command: gatewayd lnd
environment:
# Path to folder containing gateway config and data files
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
- fedimintd_1

fedimintd_2:
image: fedimint/fedimintd:6bc6ba15eb1cf8d67a009af5663468b01db8756f
image: fedimint/fedimintd:v0.1.0-rc3
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18173
Expand All @@ -79,7 +79,7 @@ services:
# ipv4_address: 10.5.0.8

fedimintd_3:
image: fedimint/fedimintd:6bc6ba15eb1cf8d67a009af5663468b01db8756f
image: fedimint/fedimintd:v0.1.0-rc3
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18174
Expand All @@ -94,7 +94,7 @@ services:
- ./fm_3/data:/data

fedimintd_4:
image: fedimint/fedimintd:6bc6ba15eb1cf8d67a009af5663468b01db8756f
image: fedimint/fedimintd:v0.1.0-rc3
environment:
- FM_DATA_DIR=/data
- FM_BIND_P2P=0.0.0.0:18175
Expand Down
88 changes: 53 additions & 35 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils";
fedimint = {
url = "github:fedimint/fedimint?rev=6bc6ba15eb1cf8d67a009af5663468b01db8756f";
url = "github:fedimint/fedimint?ref=refs/tags/v0.1.0-rc3";
};
};
outputs = { self, nixpkgs, flake-utils, fedimint }:
Expand Down

0 comments on commit 4c1fcf9

Please sign in to comment.