Skip to content

Commit 87f843d

Browse files
ci: document and fix a couple things for local Docker testing (firezone#3672)
Signed-off-by: Reactor Scram <[email protected]> Co-authored-by: Jamil <[email protected]>
1 parent 073b324 commit 87f843d

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ To start the local Firezone cluster, follow these steps:
9898

9999
```
100100
docker compose build
101-
docker compose up -d postgres
102101
docker compose run --rm elixir /bin/sh -c "cd apps/domain && mix ecto.create && mix ecto.migrate && mix ecto.seed"
103102
104103
# Before moving to the next step, copy the Firezone account UUID from the seed step

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ services:
114114
RUST_LOG: firezone_linux_client=trace,wire=trace,connlib_client_shared=trace,firezone_tunnel=trace,connlib_shared=trace,warn
115115
FIREZONE_API_URL: ws://api:8081
116116
FIREZONE_ID: D0455FDE-8F65-4960-A778-B934E4E85A5F
117+
init: true
117118
build:
118119
target: debug
119120
context: rust

rust/linux-client/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ cargo build --release --bin firezone-linux-client
1313

1414
You should then find a binary in `target/release/firezone-linux-client`.
1515

16+
The releases on Github are built with musl. To build this way, use:
17+
18+
```bash
19+
rustup target add x86_64-unknown-linux-musl
20+
sudo apt-get install musl-tools
21+
cargo build --release --bin firezone-linux-client --target x86_64-unknown-linux-musl
22+
```
23+
1624
## Running
1725

1826
To run the Linux client:

scripts/tests/dns-etc-resolvconf.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ function gateway() {
2121
docker compose exec -it gateway "$@"
2222
}
2323

24+
# Re-up the gateway since a local dev setup may run this back-to-back
25+
docker compose up -d gateway
26+
2427
echo "# check original resolv.conf"
2528
client sh -c "cat /etc/resolv.conf.firezone-backup"
2629

0 commit comments

Comments
 (0)