Skip to content

Commit

Permalink
Merge branch 'main' into fix-dockerfile-name
Browse files Browse the repository at this point in the history
  • Loading branch information
Echsecutor authored Dec 11, 2024
2 parents 393724a + ace5828 commit c793938
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
- name: Setup test network configs
run: cd test && ./init-test-network.sh indy_node:${{ matrix.os_version }}
- name: Start test network
run: cd test && env SOCK=/var/run/docker.sock IMAGE_NAME_NODE=indy_node:${{ matrix.os_version }} IMAGE_NAME_CONTROLLER=indy_node_controller docker-compose up -d
run: cd test && env SOCK=/var/run/docker.sock IMAGE_NAME_NODE=indy_node:${{ matrix.os_version }} IMAGE_NAME_CONTROLLER=indy_node_controller docker compose up -d
- name: Get Ledger State
id: ledger
run: |
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
id: node-restart
run: |
echo "::set-output name=restart-time::$(date +%s)"
cd test && echo -e "indy-cli\npool create test gen_txn_file=/pool_transactions_genesis\npool connect test\nwallet create wallet key=1234\nwallet open wallet key=1234\ndid new seed=000000000000000000000000Trustee1\ndid use V4SGRU86Z58d6TV7PBUe6f\nledger pool-restart action=start" | docker-compose run indy-cli
cd test && echo -e "indy-cli\npool create test gen_txn_file=/pool_transactions_genesis\npool connect test\nwallet create wallet key=1234\nwallet open wallet key=1234\ndid new seed=000000000000000000000000Trustee1\ndid use V4SGRU86Z58d6TV7PBUe6f\nledger pool-restart action=start" | docker compose run indy-cli
- name: Get node restart status
id: nodes_restarted
run: |
Expand Down
8 changes: 4 additions & 4 deletions run/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ rm -rf lib_indy/ssi4de/
mkdir lib_indy/YOUR_NETWORK_NAME
```

Run `docker-compose up --scale indy-controller=0`. This will run some setup and you will get some information which needs to share with the other nodes from the output like:
Run `docker compose up --scale indy-controller=0`. This will run some setup and you will get some information which needs to share with the other nodes from the output like:

```
...
Expand Down Expand Up @@ -69,7 +69,7 @@ Note down the created did and verkey and share it with your network peers for th
### Running the node

```
indy-node-container/run$ docker-compose up -d
indy-node-container/run$ docker compose up -d
```

you might want to check logs, ledger info (see e.gg. https://github.com/IDunion/Internal-Information/tree/main/Tools/get-validator-info ), etc 😉
Expand Down Expand Up @@ -151,7 +151,7 @@ You can set logging options globally fot the Docker Daemon for all Containers in
}
```

### Via docker-compose
### Via docker compose

See [docker-compose.yml](./docker-compose.yml):

Expand All @@ -168,7 +168,7 @@ services:
## Node Controller
Our current approach to handle pool restarts is to have the node controller running in a separate service container which has access to the docker socket. You can run the node without the node controller with e.g. `docker-compose up --scale indy-controller=0`. Note however that such nodes will not participate in pool restarts.
Our current approach to handle pool restarts is to have the node controller running in a separate service container which has access to the docker socket. You can run the node without the node controller with e.g. `docker compose up --scale indy-controller=0`. Note however that such nodes will not participate in pool restarts.

If wou want to use the node controller, the variables `SOCK`, `NODE_CONTAINER_NAME`, `CONTROLLER_CONTAINER`, and `IMAGE_NAME_CONTROLLER` need to be set in the `.env` file. Appropriate default values are set in [the default file](/.env).

Expand Down
2 changes: 1 addition & 1 deletion run/etc_indy/indy_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

## Logging
# 0 means everything
logLevel = 1
logLevel = 20

# Enable/Disable stdout logging
enableStdOutLogging = True
Expand Down
4 changes: 2 additions & 2 deletions test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The docker network will use the subnet 10.133.133.0/24. You may change that acco

1. Check/Update `.env`, `docker-compose.yaml` and `init-test-network.sh` files - if you need to update the IP subnet, then the change must be made everywhere.
2. Run `init-test-network.sh` to create genesis and key files.
3. Run `docker-compose up` to start the network.
3. Run `docker compose up` to start the network.
4. Check the ledger browser at http://localhost:9000 .
5. Use `docker-compose down` to shutdown the network.
5. Use `docker compose down` to shutdown the network.

0 comments on commit c793938

Please sign in to comment.