Skip to content

Commit e0908d0

Browse files
wip-abramsonwip-abramson
committed
update aries-fl to latest docker config refactor
1 parent fcb0b5f commit e0908d0

File tree

5 files changed

+155
-156
lines changed

5 files changed

+155
-156
lines changed

‎projects/aries-fl/Dockerfile

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎projects/aries-fl/docker-compose.yml

Lines changed: 136 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
11
version: "3"
22
services:
33
nhstrust-agent:
4-
image: bcgovimages/aries-cloudagent:py36-1.14-1_0.5.1
4+
build:
5+
context: ../../
6+
dockerfile: dockerfiles/agents/Dockerfile
7+
environment:
8+
- ADMIN_URL=http://nhstrust-agent:${NHSTRUST_ADMIN_PORT}
9+
- AGENT_NAME=${NHSTRUST_AGENT_NAME}
10+
- ADMIN_PORT=${NHSTRUST_ADMIN_PORT}
11+
- HTTP_PORT=${NHSTRUST_HTTP_PORT}
12+
- WEBHOOK_URL=${NHSTRUST_WEBHOOK_URL}
13+
- AGENT_ENDPOINT=${NHSTRUST_AGENT_ENDPOINT}
14+
- WALLET_SEED=${NHSTRUST_WALLET_SEED}
15+
- WALLET_NAME=${NHSTRUST_WALLET_NAME}
16+
- WALLET_KEY=${NHSTRUST_WALLET_KEY}
17+
- WALLET_TYPE=${WALLET_TYPE}
18+
- ACAPY_ADMIN_INSECURE_MODE=true
19+
- GENESIS_URL=${GENESIS_URL}
520
ports:
621
- ${NHSTRUST_HTTP_PORT}:${NHSTRUST_HTTP_PORT}
722
- ${NHSTRUST_ADMIN_PORT}:${NHSTRUST_ADMIN_PORT}
823
networks:
924
- indy_demo
1025
entrypoint: /bin/bash
1126
command: [
12-
"-c",
13-
"sleep 2; \
14-
aca-py start \
15-
--inbound-transport http '0.0.0.0' ${NHSTRUST_HTTP_PORT} \
16-
--outbound-transport http \
17-
--endpoint ${NHSTRUST_AGENT_ENDPOINT} \
18-
--webhook-url ${NHSTRUST_WEBHOOK_URL} \
19-
--wallet-type 'indy' \
20-
--seed '${NHSTRUST_WALLET_SEED}' \
21-
--admin '0.0.0.0' ${NHSTRUST_ADMIN_PORT} \
22-
--admin-insecure-mode \
23-
--log-level info \
24-
--genesis-url '${GENESIS_URL}' \
25-
--label '${NHSTRUST_AGENT_NAME}'",
26-
]
27+
"-c",
28+
"sleep 3;
29+
python3 scripts/parse_yml_env_variables.py -c ./configuration/aries-args-basic.yaml; \
30+
sleep 20; \
31+
aca-py start --arg-file /tmp/agent_conf.yml"
32+
]
2733
nhstrust-notebook:
2834
build:
29-
context: .
35+
context: ../../
36+
dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
3037
args:
3138
- jupyter_port=${NHSTRUST_JUPYTER_PORT}
3239
depends_on:
@@ -36,37 +43,42 @@ services:
3643
volumes:
3744
- ${PWD}/notebooks/nhs_trust:/workspace
3845
ports:
39-
- "${NHSTRUST_JUPYTER_PORT}:8888"
46+
- ${NHSTRUST_JUPYTER_PORT}:8888
4047
- ${NHSTRUST_WEBHOOK_PORT}:${NHSTRUST_WEBHOOK_PORT}
4148
regulator-agent:
42-
image: bcgovimages/aries-cloudagent:py36-1.14-1_0.5.1
49+
build:
50+
context: ../../
51+
dockerfile: dockerfiles/agents/Dockerfile
52+
environment:
53+
- ADMIN_URL=http://regulator-agent:${REGULATOR_ADMIN_PORT}
54+
- AGENT_NAME=${REGULATOR_AGENT_NAME}
55+
- ADMIN_PORT=${REGULATOR_ADMIN_PORT}
56+
- HTTP_PORT=${REGULATOR_HTTP_PORT}
57+
- WEBHOOK_URL=${REGULATOR_WEBHOOK_URL}
58+
- AGENT_ENDPOINT=${REGULATOR_AGENT_ENDPOINT}
59+
- WALLET_SEED=${REGULATOR_WALLET_SEED}
60+
- WALLET_NAME=${REGULATOR_WALLET_NAME}
61+
- WALLET_KEY=${REGULATOR_WALLET_KEY}
62+
- WALLET_TYPE=${WALLET_TYPE}
63+
- ACAPY_ADMIN_INSECURE_MODE=true
64+
- GENESIS_URL=${GENESIS_URL}
4365
ports:
4466
- ${REGULATOR_HTTP_PORT}:${REGULATOR_HTTP_PORT}
4567
- ${REGULATOR_ADMIN_PORT}:${REGULATOR_ADMIN_PORT}
4668
networks:
4769
- indy_demo
48-
# volumes:
49-
# - alice-wallet:/indy/home/.indy_client/default
5070
entrypoint: /bin/bash
5171
command: [
52-
"-c",
53-
"sleep 2; \
54-
aca-py start \
55-
--inbound-transport http '0.0.0.0' ${REGULATOR_HTTP_PORT} \
56-
--outbound-transport http \
57-
--endpoint ${REGULATOR_AGENT_ENDPOINT} \
58-
--webhook-url ${REGULATOR_WEBHOOK_URL} \
59-
--wallet-type 'indy' \
60-
--seed '$REGULATOR_WALLET_SEED}' \
61-
--admin '0.0.0.0' ${REGULATOR_ADMIN_PORT} \
62-
--admin-insecure-mode \
63-
--log-level info \
64-
--genesis-url '${GENESIS_URL}' \
65-
--label '${REGULATOR_AGENT_NAME}'",
72+
"-c",
73+
"sleep 3;
74+
python3 scripts/parse_yml_env_variables.py -c ./configuration/aries-args-basic.yaml; \
75+
sleep 20; \
76+
aca-py start --arg-file /tmp/agent_conf.yml"
6677
]
6778
regulator-notebook:
6879
build:
69-
context: .
80+
context: ../../
81+
dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
7082
args:
7183
- jupyter_port=${REGULATOR_JUPYTER_PORT}
7284
depends_on:
@@ -79,35 +91,39 @@ services:
7991
- "${REGULATOR_JUPYTER_PORT}:8888"
8092
- ${REGULATOR_WEBHOOK_PORT}:${REGULATOR_WEBHOOK_PORT}
8193
researcher-agent:
82-
image: bcgovimages/aries-cloudagent:py36-1.14-1_0.5.1
94+
build:
95+
context: ../../
96+
dockerfile: dockerfiles/agents/Dockerfile
97+
environment:
98+
- ADMIN_URL=http://researcher-agent:${RESEARCHER_ADMIN_PORT}
99+
- AGENT_NAME=${RESEARCHER_AGENT_NAME}
100+
- ADMIN_PORT=${RESEARCHER_ADMIN_PORT}
101+
- HTTP_PORT=${RESEARCHER_HTTP_PORT}
102+
- WEBHOOK_URL=${RESEARCHER_WEBHOOK_URL}
103+
- AGENT_ENDPOINT=${RESEARCHER_AGENT_ENDPOINT}
104+
- WALLET_SEED=${RESEARCHER_WALLET_SEED}
105+
- WALLET_NAME=${RESEARCHER_WALLET_NAME}
106+
- WALLET_KEY=${RESEARCHER_WALLET_KEY}
107+
- WALLET_TYPE=${WALLET_TYPE}
108+
- ACAPY_ADMIN_INSECURE_MODE=true
109+
- GENESIS_URL=${GENESIS_URL}
83110
ports:
84111
- ${RESEARCHER_HTTP_PORT}:${RESEARCHER_HTTP_PORT}
85112
- ${RESEARCHER_ADMIN_PORT}:${RESEARCHER_ADMIN_PORT}
86113
networks:
87114
- indy_demo
88-
# volumes:
89-
# - alice-wallet:/indy/home/.indy_client/default
90115
entrypoint: /bin/bash
91116
command: [
92117
"-c",
93-
"
94-
sleep 2; \
95-
aca-py start \
96-
--inbound-transport http '0.0.0.0' ${RESEARCHER_HTTP_PORT} \
97-
--outbound-transport http \
98-
--endpoint ${RESEARCHER_AGENT_ENDPOINT} \
99-
--webhook-url ${RESEARCHER_WEBHOOK_URL} \
100-
--wallet-type 'indy' \
101-
--seed '${RESEARCHER_WALLET_SEED}' \
102-
--admin '0.0.0.0' ${RESEARCHER_ADMIN_PORT} \
103-
--admin-insecure-mode \
104-
--log-level info \
105-
--genesis-url '${GENESIS_URL}' \
106-
--label '${RESEARCHER_AGENT_NAME}'",
118+
"sleep 3;
119+
python3 scripts/parse_yml_env_variables.py -c ./configuration/aries-args-basic.yaml; \
120+
sleep 20; \
121+
aca-py start --arg-file /tmp/agent_conf.yml"
107122
]
108123
researcher-notebook:
109124
build:
110-
context: .
125+
context: ../../
126+
dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
111127
args:
112128
- jupyter_port=${RESEARCHER_JUPYTER_PORT}
113129
depends_on:
@@ -120,35 +136,39 @@ services:
120136
- "${RESEARCHER_JUPYTER_PORT}:8888"
121137
- ${RESEARCHER_WEBHOOK_PORT}:${RESEARCHER_WEBHOOK_PORT}
122138
hospital1-agent:
123-
image: bcgovimages/aries-cloudagent:py36-1.14-1_0.5.1
139+
build:
140+
context: ../../
141+
dockerfile: dockerfiles/agents/Dockerfile
142+
environment:
143+
- ADMIN_URL=http://hospital1-agent:${HOSPITAL1_ADMIN_PORT}
144+
- AGENT_NAME=${HOSPITAL1_AGENT_NAME}
145+
- ADMIN_PORT=${HOSPITAL1_ADMIN_PORT}
146+
- HTTP_PORT=${HOSPITAL1_HTTP_PORT}
147+
- WEBHOOK_URL=${HOSPITAL1_WEBHOOK_URL}
148+
- AGENT_ENDPOINT=${HOSPITAL1_AGENT_ENDPOINT}
149+
- WALLET_SEED=${HOSPITAL1_WALLET_SEED}
150+
- WALLET_NAME=${HOSPITAL1_WALLET_NAME}
151+
- WALLET_KEY=${HOSPITAL1_WALLET_KEY}
152+
- WALLET_TYPE=${WALLET_TYPE}
153+
- ACAPY_ADMIN_INSECURE_MODE=true
154+
- GENESIS_URL=${GENESIS_URL}
124155
ports:
125156
- ${HOSPITAL1_HTTP_PORT}:${HOSPITAL1_HTTP_PORT}
126157
- ${HOSPITAL1_ADMIN_PORT}:${HOSPITAL1_ADMIN_PORT}
127158
networks:
128159
- indy_demo
129-
# volumes:
130-
# - alice-wallet:/indy/home/.indy_client/default
131160
entrypoint: /bin/bash
132161
command: [
133162
"-c",
134-
"
135-
sleep 2; \
136-
aca-py start \
137-
--inbound-transport http '0.0.0.0' ${HOSPITAL1_HTTP_PORT} \
138-
--outbound-transport http \
139-
--endpoint ${HOSPITAL1_AGENT_ENDPOINT} \
140-
--webhook-url ${HOSPITAL1_WEBHOOK_URL} \
141-
--wallet-type 'indy' \
142-
--seed '${HOSPITAL1_WALLET_SEED}' \
143-
--admin '0.0.0.0' ${HOSPITAL1_ADMIN_PORT} \
144-
--admin-insecure-mode \
145-
--log-level info \
146-
--genesis-url '${GENESIS_URL}' \
147-
--label '${HOSPITAL1_AGENT_NAME}'",
163+
"sleep 3;
164+
python3 scripts/parse_yml_env_variables.py -c ./configuration/aries-args-basic.yaml; \
165+
sleep 20; \
166+
aca-py start --arg-file /tmp/agent_conf.yml"
148167
]
149168
hospital1-notebook:
150169
build:
151-
context: .
170+
context: ../../
171+
dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
152172
args:
153173
- jupyter_port=${HOSPITAL1_JUPYTER_PORT}
154174
depends_on:
@@ -161,34 +181,39 @@ services:
161181
- "${HOSPITAL1_JUPYTER_PORT}:8888"
162182
- ${HOSPITAL1_WEBHOOK_PORT}:${HOSPITAL1_WEBHOOK_PORT}
163183
hospital2-agent:
164-
image: bcgovimages/aries-cloudagent:py36-1.14-1_0.5.1
184+
build:
185+
context: ../../
186+
dockerfile: dockerfiles/agents/Dockerfile
187+
environment:
188+
- ADMIN_URL=http://hospital2-agent:${HOSPITAL2_ADMIN_PORT}
189+
- AGENT_NAME=${HOSPITAL2_AGENT_NAME}
190+
- ADMIN_PORT=${HOSPITAL2_ADMIN_PORT}
191+
- HTTP_PORT=${HOSPITAL2_HTTP_PORT}
192+
- WEBHOOK_URL=${HOSPITAL2_WEBHOOK_URL}
193+
- AGENT_ENDPOINT=${HOSPITAL2_AGENT_ENDPOINT}
194+
- WALLET_SEED=${HOSPITAL2_WALLET_SEED}
195+
- WALLET_NAME=${HOSPITAL2_WALLET_NAME}
196+
- WALLET_KEY=${HOSPITAL2_WALLET_KEY}
197+
- WALLET_TYPE=${WALLET_TYPE}
198+
- ACAPY_ADMIN_INSECURE_MODE=true
199+
- GENESIS_URL=${GENESIS_URL}
165200
ports:
166201
- ${HOSPITAL2_HTTP_PORT}:${HOSPITAL2_HTTP_PORT}
167202
- ${HOSPITAL2_ADMIN_PORT}:${HOSPITAL2_ADMIN_PORT}
168203
networks:
169204
- indy_demo
170-
# volumes:
171-
# - alice-wallet:/indy/home/.indy_client/default
172205
entrypoint: /bin/bash
173206
command: [
174207
"-c",
175-
"sleep 2; \
176-
aca-py start \
177-
--inbound-transport http '0.0.0.0' ${HOSPITAL2_HTTP_PORT} \
178-
--outbound-transport http \
179-
--endpoint ${HOSPITAL2_AGENT_ENDPOINT} \
180-
--webhook-url ${HOSPITAL2_WEBHOOK_URL} \
181-
--wallet-type 'indy' \
182-
--seed '${HOSPITAL2_WALLET_SEED}' \
183-
--admin '0.0.0.0' ${HOSPITAL2_ADMIN_PORT} \
184-
--admin-insecure-mode \
185-
--log-level info \
186-
--genesis-url '${GENESIS_URL}' \
187-
--label '${HOSPITAL2_AGENT_NAME}'",
208+
"sleep 3;
209+
python3 scripts/parse_yml_env_variables.py -c ./configuration/aries-args-basic.yaml; \
210+
sleep 20; \
211+
aca-py start --arg-file /tmp/agent_conf.yml"
188212
]
189213
hospital2-notebook:
190214
build:
191-
context: .
215+
context: ../../
216+
dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
192217
args:
193218
- jupyter_port=${HOSPITAL2_JUPYTER_PORT}
194219
depends_on:
@@ -201,34 +226,39 @@ services:
201226
- "${HOSPITAL2_JUPYTER_PORT}:8888"
202227
- ${HOSPITAL2_WEBHOOK_PORT}:${HOSPITAL2_WEBHOOK_PORT}
203228
hospital3-agent:
204-
image: bcgovimages/aries-cloudagent:py36-1.14-1_0.5.1
229+
build:
230+
context: ../../
231+
dockerfile: dockerfiles/agents/Dockerfile
232+
environment:
233+
- ADMIN_URL=http://hospital3-agent:${HOSPITAL3_ADMIN_PORT}
234+
- AGENT_NAME=${HOSPITAL3_AGENT_NAME}
235+
- ADMIN_PORT=${HOSPITAL3_ADMIN_PORT}
236+
- HTTP_PORT=${HOSPITAL3_HTTP_PORT}
237+
- WEBHOOK_URL=${HOSPITAL3_WEBHOOK_URL}
238+
- AGENT_ENDPOINT=${HOSPITAL3_AGENT_ENDPOINT}
239+
- WALLET_SEED=${HOSPITAL3_WALLET_SEED}
240+
- WALLET_NAME=${HOSPITAL3_WALLET_NAME}
241+
- WALLET_KEY=${HOSPITAL3_WALLET_KEY}
242+
- WALLET_TYPE=${WALLET_TYPE}
243+
- ACAPY_ADMIN_INSECURE_MODE=true
244+
- GENESIS_URL=${GENESIS_URL}
205245
ports:
206246
- ${HOSPITAL3_HTTP_PORT}:${HOSPITAL3_HTTP_PORT}
207247
- ${HOSPITAL3_ADMIN_PORT}:${HOSPITAL3_ADMIN_PORT}
208248
networks:
209249
- indy_demo
210-
# volumes:
211-
# - alice-wallet:/indy/home/.indy_client/default
212250
entrypoint: /bin/bash
213251
command: [
214252
"-c",
215-
"sleep 2; \
216-
aca-py start \
217-
--inbound-transport http '0.0.0.0' ${HOSPITAL3_HTTP_PORT} \
218-
--outbound-transport http \
219-
--endpoint ${HOSPITAL3_AGENT_ENDPOINT} \
220-
--webhook-url ${HOSPITAL3_WEBHOOK_URL} \
221-
--wallet-type 'indy' \
222-
--seed '${HOSPITAL3_WALLET_SEED}' \
223-
--admin '0.0.0.0' ${HOSPITAL3_ADMIN_PORT} \
224-
--admin-insecure-mode \
225-
--log-level info \
226-
--genesis-url '${GENESIS_URL}' \
227-
--label '${HOSPITAL3_AGENT_NAME}'",
253+
"sleep 3;
254+
python3 scripts/parse_yml_env_variables.py -c ./configuration/aries-args-basic.yaml; \
255+
sleep 20; \
256+
aca-py start --arg-file /tmp/agent_conf.yml"
228257
]
229258
hospital3-notebook:
230259
build:
231-
context: .
260+
context: ../../
261+
dockerfile: dockerfiles/controllers/Dockerfile.basiccontroller
232262
args:
233263
- jupyter_port=${HOSPITAL3_JUPYTER_PORT}
234264
depends_on:

‎projects/aries-fl/get_URLS.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)