From df7ed3f9a21fdefd39e08e4ddf0051af0ecd2720 Mon Sep 17 00:00:00 2001 From: Stephen Curran Date: Thu, 9 Jan 2025 07:52:23 -0800 Subject: [PATCH 1/3] Follow up from Release 1.2.0 -- including LTS change Signed-off-by: Stephen Curran --- demo/playground/Dockerfile.acapy | 2 +- demo/playground/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/playground/Dockerfile.acapy b/demo/playground/Dockerfile.acapy index 3b4c582576..5dfa08027a 100644 --- a/demo/playground/Dockerfile.acapy +++ b/demo/playground/Dockerfile.acapy @@ -1,4 +1,4 @@ -FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0 +FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.0 USER root diff --git a/demo/playground/README.md b/demo/playground/README.md index 563be10d7b..6608418b4d 100644 --- a/demo/playground/README.md +++ b/demo/playground/README.md @@ -26,7 +26,7 @@ These configuration files are provided to the ACA-Py start command via the `AGEN ### Dockerfile and start.sh -[`Dockerfile.acapy`](./Dockerfile.acapy) assembles the image to run. Currently based on [ACA-Py 1.1.0](ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0), we need [jq](https://stedolan.github.io/jq/) to setup (or not) the ngrok tunnel and execute the Aca-py start command - see [`start.sh`](./start.sh). You may note that the start command is very sparse, additional configuration is done via environment variables in the [docker compose file](./docker-compose.yml). +[`Dockerfile.acapy`](./Dockerfile.acapy) assembles the image to run. Currently based on [ACA-Py 1.2.0](ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.0), we need [jq](https://stedolan.github.io/jq/) to setup (or not) the ngrok tunnel and execute the Aca-py start command - see [`start.sh`](./start.sh). You may note that the start command is very sparse, additional configuration is done via environment variables in the [docker compose file](./docker-compose.yml). ### ngrok From 6adf6331505c030ec284a4a4184625ce99429c6c Mon Sep 17 00:00:00 2001 From: Stephen Curran Date: Thu, 9 Jan 2025 07:53:14 -0800 Subject: [PATCH 2/3] Follow up from Release 1.2.0 -- including LTS change Signed-off-by: Stephen Curran --- .github/workflows/snyk-lts.yml | 1 + demo/docker-agent/Dockerfile.acapy | 2 +- demo/multi-demo/Dockerfile.acapy | 2 +- docker/Dockerfile.demo | 2 +- docs/features/DIDResolution.md | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/snyk-lts.yml b/.github/workflows/snyk-lts.yml index 8823962a69..ad98657b1b 100644 --- a/.github/workflows/snyk-lts.yml +++ b/.github/workflows/snyk-lts.yml @@ -5,6 +5,7 @@ on: # These branches represent the LTS releases branches: - 0.12.lts + - 1.2.lts paths: - acapy_agent/** - docker/** diff --git a/demo/docker-agent/Dockerfile.acapy b/demo/docker-agent/Dockerfile.acapy index 6dc11121d9..0fad59f419 100644 --- a/demo/docker-agent/Dockerfile.acapy +++ b/demo/docker-agent/Dockerfile.acapy @@ -1,4 +1,4 @@ -FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0 +FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.0 USER root diff --git a/demo/multi-demo/Dockerfile.acapy b/demo/multi-demo/Dockerfile.acapy index 6dc11121d9..0fad59f419 100644 --- a/demo/multi-demo/Dockerfile.acapy +++ b/demo/multi-demo/Dockerfile.acapy @@ -1,4 +1,4 @@ -FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0 +FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.0 USER root diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo index 25d97dd25f..dfbf170e55 100644 --- a/docker/Dockerfile.demo +++ b/docker/Dockerfile.demo @@ -1,4 +1,4 @@ -ARG from_image=ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0 +ARG from_image=ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.0 FROM ${from_image} ENV ENABLE_PTVSD 0 diff --git a/docs/features/DIDResolution.md b/docs/features/DIDResolution.md index d3e3203639..e7da6ab1a0 100644 --- a/docs/features/DIDResolution.md +++ b/docs/features/DIDResolution.md @@ -176,7 +176,7 @@ plugin: The following is a fully functional Dockerfile encapsulating this setup: ```dockerfile= -FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.1.0 +FROM ghcr.io/openwallet-foundation/acapy-agent:py3.12-1.2.0 RUN pip3 install git+https://github.com/dbluhm/acapy-resolver-github CMD ["aca-py", "start", "-it", "http", "0.0.0.0", "3000", "-ot", "http", "-e", "http://localhost:3000", "--admin", "0.0.0.0", "3001", "--admin-insecure-mode", "--no-ledger", "--plugin", "acapy_resolver_github"] From f8868b5887e5c9087b55432945ef6a94751ae22f Mon Sep 17 00:00:00 2001 From: Stephen Curran Date: Thu, 9 Jan 2025 09:04:27 -0800 Subject: [PATCH 3/3] Update snyk file to add 0.12.lts source code path Signed-off-by: Stephen Curran --- .github/workflows/snyk-lts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snyk-lts.yml b/.github/workflows/snyk-lts.yml index ad98657b1b..901a3aa185 100644 --- a/.github/workflows/snyk-lts.yml +++ b/.github/workflows/snyk-lts.yml @@ -7,6 +7,7 @@ on: - 0.12.lts - 1.2.lts paths: + - aries_cloudagent/** - acapy_agent/** - docker/**