From 6abb22d99e2ea4504edc2faed27298a0a4c4e926 Mon Sep 17 00:00:00 2001 From: Alex Walker Date: Thu, 24 Aug 2023 19:54:15 +0000 Subject: [PATCH 1/4] chore: update ACA-Py to 0.10.0-rc1 Signed-off-by: Alex Walker --- docker-compose.yml | 4 ++-- examples/json_ld/docker-compose.yml | 4 ++-- examples/presenting_revoked_credential/docker-compose.yml | 4 ++-- examples/simple/docker-compose.yml | 4 ++-- examples/tunnels/docker-compose.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c689b62..ebf70c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 # image: acapy-test-image # build: # context: . @@ -43,7 +43,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 # image: acapy-test-image # build: # context: . diff --git a/examples/json_ld/docker-compose.yml b/examples/json_ld/docker-compose.yml index 0977729..80e0a4b 100644 --- a/examples/json_ld/docker-compose.yml +++ b/examples/json_ld/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 ports: - "3001:3001" command: > @@ -25,7 +25,7 @@ services: retries: 5 bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 ports: - "3002:3001" command: > diff --git a/examples/presenting_revoked_credential/docker-compose.yml b/examples/presenting_revoked_credential/docker-compose.yml index 9c7bc84..95f72a1 100644 --- a/examples/presenting_revoked_credential/docker-compose.yml +++ b/examples/presenting_revoked_credential/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 # image: acapy-test-image # build: # context: . @@ -40,7 +40,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 #image: bcgovimages/aries-cloudagent:py36-1.16-1_0.7.5 #image: bcgovimages/aries-cloudagent:py36-1.16-1_1.0.0-rc0 # image: acapy-test-image diff --git a/examples/simple/docker-compose.yml b/examples/simple/docker-compose.yml index c1cc76e..d2a22f5 100644 --- a/examples/simple/docker-compose.yml +++ b/examples/simple/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 ports: - "3001:3001" command: > @@ -34,7 +34,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 ports: - "3002:3001" command: > diff --git a/examples/tunnels/docker-compose.yml b/examples/tunnels/docker-compose.yml index e263815..5973faf 100644 --- a/examples/tunnels/docker-compose.yml +++ b/examples/tunnels/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 #image: bcgovimages/aries-cloudagent:py36-1.16-1_0.7.5 #image: bcgovimages/aries-cloudagent:py36-1.16-1_1.0.0-rc0 # image: acapy-test-image @@ -50,7 +50,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.9.0 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 #image: bcgovimages/aries-cloudagent:py36-1.16-1_0.7.5 #image: bcgovimages/aries-cloudagent:py36-1.16-1_1.0.0-rc0 # image: acapy-test-image From d4ffbbbcfc6261d7b66c6d9bceb3549456b5e271 Mon Sep 17 00:00:00 2001 From: Alex Walker Date: Tue, 5 Sep 2023 12:09:14 -0700 Subject: [PATCH 2/4] chore: update to ACA-Py 0.10.1 Signed-off-by: Alex Walker --- docker-compose.yml | 14 +++++++------- examples/json_ld/docker-compose.yml | 4 ++-- .../docker-compose.yml | 4 ++-- examples/simple/docker-compose.yml | 4 ++-- examples/tunnels/docker-compose.yml | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ebf70c3..a8bac4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ # This docker-compose file is used for tests only -version: "3" +version: '3' services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 # image: acapy-test-image # build: # context: . @@ -11,7 +11,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - "3001:3001" + - '3001:3001' volumes: - ./configs:/configs:ro,z command: > @@ -43,7 +43,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 # image: acapy-test-image # build: # context: . @@ -51,7 +51,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - "3002:3001" + - '3002:3001' volumes: - ./configs:/configs:ro,z command: > @@ -105,14 +105,14 @@ services: build: context: . args: - install_flags: "" + install_flags: '' environment: - ALICE=http://alice:3001 - BOB=http://bob:3001 volumes: - ./controller:/usr/src/app/controller:z - ./tests:/usr/src/app/tests:z - entrypoint: "poetry run pytest" + entrypoint: 'poetry run pytest' depends_on: alice: condition: service_healthy diff --git a/examples/json_ld/docker-compose.yml b/examples/json_ld/docker-compose.yml index 80e0a4b..c61f59c 100644 --- a/examples/json_ld/docker-compose.yml +++ b/examples/json_ld/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 ports: - "3001:3001" command: > @@ -25,7 +25,7 @@ services: retries: 5 bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 ports: - "3002:3001" command: > diff --git a/examples/presenting_revoked_credential/docker-compose.yml b/examples/presenting_revoked_credential/docker-compose.yml index 95f72a1..7932f81 100644 --- a/examples/presenting_revoked_credential/docker-compose.yml +++ b/examples/presenting_revoked_credential/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 # image: acapy-test-image # build: # context: . @@ -40,7 +40,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 #image: bcgovimages/aries-cloudagent:py36-1.16-1_0.7.5 #image: bcgovimages/aries-cloudagent:py36-1.16-1_1.0.0-rc0 # image: acapy-test-image diff --git a/examples/simple/docker-compose.yml b/examples/simple/docker-compose.yml index d2a22f5..7b71079 100644 --- a/examples/simple/docker-compose.yml +++ b/examples/simple/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 ports: - "3001:3001" command: > @@ -34,7 +34,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 ports: - "3002:3001" command: > diff --git a/examples/tunnels/docker-compose.yml b/examples/tunnels/docker-compose.yml index 5973faf..c5a64e6 100644 --- a/examples/tunnels/docker-compose.yml +++ b/examples/tunnels/docker-compose.yml @@ -1,7 +1,7 @@ -version: "3" +version: '3' services: alice: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 #image: bcgovimages/aries-cloudagent:py36-1.16-1_0.7.5 #image: bcgovimages/aries-cloudagent:py36-1.16-1_1.0.0-rc0 # image: acapy-test-image @@ -11,7 +11,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - "3001:3001" + - '3001:3001' volumes: - ./tunnel_endpoint.sh:/tunnel_endpoint.sh:ro,z environment: @@ -50,7 +50,7 @@ services: condition: service_started bob: - image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.0-rc1 + image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 #image: bcgovimages/aries-cloudagent:py36-1.16-1_0.7.5 #image: bcgovimages/aries-cloudagent:py36-1.16-1_1.0.0-rc0 # image: acapy-test-image @@ -60,7 +60,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - "3002:3001" + - '3002:3001' volumes: - ./tunnel_endpoint.sh:/tunnel_endpoint.sh:ro,z environment: @@ -127,7 +127,7 @@ services: tunnel-tails: image: ngrok/ngrok - command: start --all + command: start --all environment: - NGROK_CONFIG=/etc/ngrok.yml volumes: From 64c8f6bac81b2fb0d4ccb7712140227093022c63 Mon Sep 17 00:00:00 2001 From: Alex Walker Date: Tue, 5 Sep 2023 13:04:53 -0700 Subject: [PATCH 3/4] fix: offending quotes Signed-off-by: Alex Walker --- docker-compose.yml | 1 - examples/json_ld/docker-compose.yml | 1 + examples/presenting_revoked_credential/docker-compose.yml | 1 + examples/simple/docker-compose.yml | 1 + examples/tunnels/docker-compose.yml | 6 +++--- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a8bac4a..37b7198 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ # This docker-compose file is used for tests only - version: '3' services: alice: diff --git a/examples/json_ld/docker-compose.yml b/examples/json_ld/docker-compose.yml index c61f59c..ea22ec2 100644 --- a/examples/json_ld/docker-compose.yml +++ b/examples/json_ld/docker-compose.yml @@ -24,6 +24,7 @@ services: timeout: 5s retries: 5 + bob: image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 ports: diff --git a/examples/presenting_revoked_credential/docker-compose.yml b/examples/presenting_revoked_credential/docker-compose.yml index 7932f81..edec343 100644 --- a/examples/presenting_revoked_credential/docker-compose.yml +++ b/examples/presenting_revoked_credential/docker-compose.yml @@ -113,3 +113,4 @@ services: --port 6543 --storage-path /tmp/tails-files --log-level INFO + diff --git a/examples/simple/docker-compose.yml b/examples/simple/docker-compose.yml index 7b71079..7979396 100644 --- a/examples/simple/docker-compose.yml +++ b/examples/simple/docker-compose.yml @@ -100,3 +100,4 @@ services: --port 6543 --storage-path /tmp/tails-files --log-level INFO + diff --git a/examples/tunnels/docker-compose.yml b/examples/tunnels/docker-compose.yml index c5a64e6..ce04577 100644 --- a/examples/tunnels/docker-compose.yml +++ b/examples/tunnels/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: alice: image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 @@ -11,7 +11,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - '3001:3001' + - "3001:3001" volumes: - ./tunnel_endpoint.sh:/tunnel_endpoint.sh:ro,z environment: @@ -60,7 +60,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - '3002:3001' + - "3002:3001" volumes: - ./tunnel_endpoint.sh:/tunnel_endpoint.sh:ro,z environment: From bfd2f02086f6b3597ece5d7d6e2cab3f6cc54709 Mon Sep 17 00:00:00 2001 From: Alex Walker Date: Tue, 5 Sep 2023 13:12:54 -0700 Subject: [PATCH 4/4] fix: offending quotes Signed-off-by: Alex Walker --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 37b7198..80b193b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ # This docker-compose file is used for tests only -version: '3' +version: "3" services: alice: image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.10.1 @@ -10,7 +10,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - '3001:3001' + - "3001:3001" volumes: - ./configs:/configs:ro,z command: > @@ -50,7 +50,7 @@ services: # args: # acapy_url: https://github.com/Indicio-tech/aries-cloudagent-python@c1fed3c13d33e65979b08dd1eaf79dc84e3ce504 ports: - - '3002:3001' + - "3002:3001" volumes: - ./configs:/configs:ro,z command: > @@ -104,14 +104,14 @@ services: build: context: . args: - install_flags: '' + install_flags: "" environment: - ALICE=http://alice:3001 - BOB=http://bob:3001 volumes: - ./controller:/usr/src/app/controller:z - ./tests:/usr/src/app/tests:z - entrypoint: 'poetry run pytest' + entrypoint: "poetry run pytest" depends_on: alice: condition: service_healthy