Merge remote-tracking branch 'upstream/main' into bcgov/feature/loki-…

…log-streaming
bcgov · Oct 21, 2024 · 200cdd5 · 200cdd5
2 parents f3729c7 + 255c387
commit 200cdd5
Show file tree

Hide file tree

Showing 11 changed files with 1,474 additions and 2,718 deletions.
diff --git a/.github/workflows/on_pr_opened.yaml b/.github/workflows/on_pr_opened.yaml
@@ -105,6 +105,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install OpenShift CLI tools
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4.14"
+
       - name: Authenticate and set context
         uses: redhat-actions/oc-login@v1
         with:

diff --git a/.github/workflows/on_push_main.yaml b/.github/workflows/on_push_main.yaml
@@ -90,6 +90,11 @@ jobs:
             services
           path: trust-over-ip-configurations
 
+      - name: Install OpenShift CLI tools
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4.14"
+
       - name: Authenticate and set context
         uses: redhat-actions/oc-login@v1
         with:

diff --git a/plugins/docker/Dockerfile b/plugins/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.0 AS base
+FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.1 AS base
 
 # Install and Configure Poetry
 USER root
@@ -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/hyperledger/aries-cloudagent-python:py3.12-1.0.0
+FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.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/hyperledger/aries-acapy-plugins@1.0.0#subdirectory=basicmessage_storage
-RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.0#subdirectory=connection_update
-RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.0#subdirectory=multitenant_provider
-RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.0#subdirectory=rpc
+RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.1#subdirectory=basicmessage_storage
+RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.1#subdirectory=connection_update
+RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.1#subdirectory=multitenant_provider
+RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@1.0.1#subdirectory=rpc
 
 
 ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]

diff --git a/plugins/pyproject.toml b/plugins/pyproject.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.12"
-aries-cloudagent = { version = "1.0.0" }
+aries-cloudagent = { version = "1.0.1" }
 python-dateutil = "^2.8.2"
 typing-extensions = "4.8.0"
 traction-innkeeper = {path = "./traction_innkeeper", develop = true}
@@ -22,7 +22,7 @@ ursa-bbs-signatures = { version = "~1.0.1" }
 python3-indy = { version = "^1.11.1" }
 
 [tool.poetry.dev-dependencies]
-ruff = "^0.5.7"
+ruff = "^0.6.9"
 
 [build-system]
 requires = ["setuptools", "poetry-core>=1.2"]

diff --git a/plugins/traction_innkeeper/poetry.lock b/plugins/traction_innkeeper/poetry.lock
diff --git a/plugins/traction_innkeeper/pyproject.toml b/plugins/traction_innkeeper/pyproject.toml
@@ -9,16 +9,16 @@ packages = [{include = "traction_innkeeper"}]
 
 [tool.poetry.dependencies]
 python = "^3.12"
-aries-cloudagent = { version = "1.0.0" }
+aries-cloudagent = { version = "1.0.1" }
 python-dateutil = "^2.8.2"
 bcrypt = "^4.2.0"
 mergedeep = "^1.3.4"
 typing-extensions = "4.8.0"
 anoncreds = "^0.2.0"
-multitenant-provider = {git = "https://github.com/hyperledger/aries-acapy-plugins", rev = "1.0.0", subdirectory = "multitenant_provider"}
+multitenant-provider = {git = "https://github.com/hyperledger/aries-acapy-plugins", rev = "1.0.1", subdirectory = "multitenant_provider"}
 
 [tool.poetry.dev-dependencies]
-black = "^24.8.0"
+black = "^24.10.0"
 flake8 = "^7.1.1"
 
 [build-system]

diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
@@ -178,7 +178,7 @@ services:
       - host.docker.internal:host-gateway
 
   endorser-agent:
-    image: ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.0
+    image: ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.1
     depends_on:
       endorser-db:
         condition: service_healthy
@@ -221,7 +221,7 @@ services:
       - host.docker.internal:host-gateway
 
   endorser-agent-1:
-    image: ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.0
+    image: ghcr.io/hyperledger/aries-cloudagent-python:py3.12-1.0.1
     depends_on:
       endorser-db:
         condition: service_healthy