Skip to content

Commit

Permalink
Merge pull request #1132 from bcgov/feature/acapy0121Update
Browse files Browse the repository at this point in the history
ACA-Py 0.12.1 version update
  • Loading branch information
loneil authored May 3, 2024
2 parents dc57ae7 + fa49529 commit ab00392
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 53 deletions.
4 changes: 2 additions & 2 deletions plugins/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.0 as base
FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1 as base

# Install and Configure Poetry
USER root
Expand All @@ -24,7 +24,7 @@ RUN poetry install --only main
RUN ln -s $(poetry env info -p)/lib/python3.6/site-packages site-packages


FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.0
FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1
COPY --from=base --chown=aries:aries /home/aries/.venv /home/aries/.venv
ENV PATH="/home/aries/.venv/bin:$PATH"

Expand Down
6 changes: 3 additions & 3 deletions plugins/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme = "README.md"

[tool.poetry.dependencies]
python = "^3.9"
aries-cloudagent = { version = "0.12.0" }
aries-cloudagent = { version = "0.12.1" }
python-dateutil = "^2.8.2"
typing-extensions = "4.8.0"
traction-innkeeper = {path = "./traction_innkeeper", develop = true}
Expand All @@ -22,8 +22,8 @@ ursa-bbs-signatures = { version = "~1.0.1" }
python3-indy = { version = "^1.11.1" }

[tool.poetry.dev-dependencies]
black = "^24.4.1"
flake8 = "^5.0.4"
black = "^24.4.2"
flake8 = "^7.0.0"

[build-system]
requires = ["setuptools", "poetry-core>=1.2"]
Expand Down
93 changes: 52 additions & 41 deletions plugins/traction_innkeeper/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions plugins/traction_innkeeper/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ packages = [{include = "traction_innkeeper"}]

[tool.poetry.dependencies]
python = "^3.9"
aries-cloudagent = { version = "0.12.0" }
aries-cloudagent = { version = "0.12.1" }
python-dateutil = "^2.8.2"
bcrypt = "^4.0.1"
bcrypt = "^4.1.2"
mergedeep = "^1.3.4"
typing-extensions = "4.8.0"

[tool.poetry.dev-dependencies]
black = "^24.4.1"
flake8 = "^5.0.4"
black = "^24.4.2"
flake8 = "^7.0.0"

[build-system]
requires = ["setuptools", "poetry-core>=1.2"]
Expand Down
2 changes: 1 addition & 1 deletion scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Currently this setup has dependencies on BCovrin Test Ledger and a registered en
Also, there are longer term goals for moving the plugins to separate repositories and allowing teams to pull them in and configure their own Aca-Py images as needed. Currently, we are pulling the plugins in as source and building a custom image. For local development, the build of this image is included in the `docker compose build` command. Once the Aca-py + plugin image is built (tagged: `traction:plugins-acapy`), that image is pulled into another that we use to run an [ngrok](https://ngrok.com) script for external access to our agent (see [services/aca-py](../services/aca-py). This is not what we are doing in production, but we are doing it here (for now).

#### traction:plugins-acapy
This image is based on [ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.0](https://github.com/hyperledger/aries-cloudagent-python/releases/tag/0.12.0) and this is where we pull in the [traction plugins](../plugins) and build out the image see [Dockerfile](../plugins/docker/Dockerfile)
This image is based on [ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1](https://github.com/hyperledger/aries-cloudagent-python/releases/tag/0.12.1) and this is where we pull in the [traction plugins](../plugins) and build out the image see [Dockerfile](../plugins/docker/Dockerfile)

The plugins are built using the base plugins [pyproject.toml](../plugins/pyproject.toml) which pulls in each plugin as source. Simply adding new plugin directories to the file system and adding to the dockerfile will not be enough, they must be dependencies in the `plugins/pyproject.toml`.

Expand Down
4 changes: 2 additions & 2 deletions scripts/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ services:
- host.docker.internal:host-gateway

endorser-agent:
image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.0
image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1
depends_on:
endorser-db:
condition: service_healthy
Expand Down Expand Up @@ -283,7 +283,7 @@ services:
- host.docker.internal:host-gateway

endorser-agent-1:
image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.0
image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1
depends_on:
endorser-db-1:
condition: service_healthy
Expand Down

0 comments on commit ab00392

Please sign in to comment.