Skip to content

Commit

Permalink
Merge pull request #1477 from bcgov/chore/acapyUpdate
Browse files Browse the repository at this point in the history
ACA-Py 1.2.1 updates
  • Loading branch information
loneil authored Jan 23, 2025
2 parents 7bca94b + 07afa71 commit bcbdf56
Show file tree
Hide file tree
Showing 16 changed files with 1,202 additions and 1,224 deletions.
1 change: 0 additions & 1 deletion plugins/.devcontainer/docker-compose.devcontainer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.9"
services:
traction-db:
image: "postgres:12"
Expand Down
1 change: 0 additions & 1 deletion plugins/.devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.9"
services:
traction-agent:
build:
Expand Down
12 changes: 6 additions & 6 deletions plugins/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0 AS base
FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.1 AS base

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


FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0
FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.1
COPY --from=base --chown=aries:aries /home/aries/.venv /home/aries/.venv
ENV PATH="/home/aries/.venv/bin:$PATH"

COPY --chown=aries:aries docker/default.yml ./
COPY --chown=aries:aries traction_innkeeper/traction_innkeeper traction_plugins/traction_innkeeper
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.1.0#subdirectory=basicmessage_storage
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.1.0#subdirectory=connection_update
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.1.0#subdirectory=multitenant_provider
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.1.0#subdirectory=rpc
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.2.1#subdirectory=basicmessage_storage
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.2.1#subdirectory=connection_update
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.2.1#subdirectory=multitenant_provider
RUN pip install git+https://github.com/openwallet-foundation/acapy-plugins@1.2.1#subdirectory=rpc


ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]
Expand Down
10 changes: 5 additions & 5 deletions plugins/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ readme = "README.md"

[tool.poetry.dependencies]
python = "^3.12"
acapy-agent = { version = "1.1.0" }
python-dateutil = "^2.8.2"
typing-extensions = "4.8.0"
acapy-agent = { version = "1.2.1" }
python-dateutil = "^2.9.0"
typing-extensions = "4.12.2"
traction-innkeeper = {path = "./traction_innkeeper", develop = true}

aries-askar = { version = "~0.3.2" }
anoncreds= { version = "0.2.0" }
indy-credx = { version = "~1.1.1" }
indy-vdr = { version = "~0.4.1" }
indy-vdr = { version = "~0.4.2" }
python3-indy = { version = "^1.11.1" }

[tool.poetry.dev-dependencies]
ruff = "^0.6.9"
ruff = "^0.9.2"

[build-system]
requires = ["setuptools", "poetry-core>=1.2"]
Expand Down
2,136 changes: 1,060 additions & 1,076 deletions plugins/traction_innkeeper/poetry.lock

Large diffs are not rendered by default.

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

[tool.poetry.dependencies]
python = "^3.12"
acapy-agent = { version = "1.1.0" }
python-dateutil = "^2.8.2"
bcrypt = "^4.2.0"
acapy-agent = { version = "1.2.1" }
python-dateutil = "^2.9.0"
bcrypt = "^4.2.1"
mergedeep = "^1.3.4"
typing-extensions = "4.8.0"
typing-extensions = "4.12.2"
anoncreds = "^0.2.0"
multitenant-provider = {git = "https://github.com/openwallet-foundation/acapy-plugins", rev = "1.1.0", subdirectory = "multitenant_provider"}
multitenant-provider = {git = "https://github.com/openwallet-foundation/acapy-plugins", rev = "1.2.1", subdirectory = "multitenant_provider"}

[tool.poetry.dev-dependencies]
black = "^24.10.0"
Expand Down
2 changes: 1 addition & 1 deletion scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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/openwallet-foundation/acapy-agent:py3.12-1.1.0](https://github.com/openwallet-foundation/acapy/releases/tag/1.1.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/openwallet-foundation/acapy-agent:py3.12-1.2.1](https://github.com/openwallet-foundation/acapy/releases/tag/1.2.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
2 changes: 0 additions & 2 deletions scripts/docker-compose.logs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

x-logging: &default-logging
driver: loki
options:
Expand Down
6 changes: 2 additions & 4 deletions scripts/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.12"

services:
ngrok-traction-agent:
image: ngrok/ngrok
Expand Down Expand Up @@ -166,7 +164,7 @@ services:
- host.docker.internal:host-gateway

endorser-agent:
image: ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0
image: ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.1
depends_on:
endorser-db:
condition: service_healthy
Expand Down Expand Up @@ -204,7 +202,7 @@ services:
- host.docker.internal:host-gateway

endorser-agent-1:
image: ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0
image: ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.1
depends_on:
endorser-db:
condition: service_healthy
Expand Down
Loading

0 comments on commit bcbdf56

Please sign in to comment.