Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transition from docker-compose to docker compose #147

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-all.yml
Original file line number Diff line number Diff line change
@@ -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: |
@@ -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: |
8 changes: 4 additions & 4 deletions run/README.md
Original file line number Diff line number Diff line change
@@ -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:

```
...
@@ -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 😉
@@ -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):

@@ -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).

4 changes: 2 additions & 2 deletions test/README.md
Original file line number Diff line number Diff line change
@@ -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.


Unchanged files with check annotations Beta

# version: 1.2+2022-02-24
FROM python:3.6-slim-buster as base

Check warning on line 9 in build/Dockerfile.debian10

GitHub Actions / Build node images (debian10)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
# Install environment
RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \
# version: 1.2+2022-02-24
FROM python:3.6-slim-bullseye as base

Check warning on line 9 in build/Dockerfile.debian11

GitHub Actions / Build node images (debian11)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
# Install environment
RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \