From b7ddfa9616a92fce2d3d38c12fed9d9ed798a61d Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Thu, 22 Jul 2021 10:27:26 +0200 Subject: [PATCH] chore(readme): small improvements for NixOS users --- README.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 293e4d9..9141c94 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,18 @@ In case you have installed Trezor Bridge previously there will be a port conflic #### Prerequisites You need: -- Docker (to run NixOS in a container). +- Docker (to run NixOS in a container). +- xhost + +On NixOS, simply enter the `nix-shell`, it is all there. #### Run it -1. Run in terminal: `xhost +` -2. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-unix` -3. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-unix` -4. Open http://localhost:9002. +1. Clone this repo `git clone git@github.com:trezor/trezor-user-env.git`. If on NixOS, enter `nix-shell`. +2. Run in terminal: `xhost +` +3. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-unix` +4. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-unix` +5. Open http://localhost:9002. For a future use you can omit the second step and run `up` (the third step) directly. **However, you will not have the latest master builds then!** @@ -66,9 +70,10 @@ Download these as you are used to. We recommend using `nix` or `brew`, but that' 1. Run XQuartz and leave it running on the background. Wait till it is launched. 2. In XQuartz settings go to Preferences > Security and enable "Allow connections from network clients". 3. Open a new terminal window (not in XQuartz) and add yourself to the X access control list: `xhost +127.0.0.1` (you will probably need to logout/login after XQuartz installation to have `xhost` command available) -4. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-mac` -5. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-mac` -6. Open http://localhost:9002. +4. Clone this repo `git clone git@github.com:trezor/trezor-user-env.git`. +5. Download the latest docker build: `docker-compose -f ./docker/compose.yml pull trezor-user-env-mac` +6. Run it: `docker-compose -f ./docker/compose.yml up trezor-user-env-mac` +7. Open http://localhost:9002. For a future use you can omit the second step and run `up` (the third step) directly. **However, you will not have the latest master builds then!**