diff --git a/openshift/templates/issuer-agent/Dockerfile b/openshift/templates/issuer-agent/Dockerfile index 8551bbe..8482894 100644 --- a/openshift/templates/issuer-agent/Dockerfile +++ b/openshift/templates/issuer-agent/Dockerfile @@ -1,3 +1,4 @@ -FROM docker.io/bcgovimages/aries-cloudagent:py36-1.16-1_0.7.4 +FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.2 -RUN echo "Just pulling the image from Docker Hub" +# Install DRP plugin in agent image +RUN pip install git+https://github.com/hyperledger/aries-acapy-plugins@0.12.2#subdirectory=rpc diff --git a/openshift/templates/issuer-agent/issuer-agent-build.param b/openshift/templates/issuer-agent/issuer-agent-build.param index 07b177f..032c737 100644 --- a/openshift/templates/issuer-agent/issuer-agent-build.param +++ b/openshift/templates/issuer-agent/issuer-agent-build.param @@ -10,11 +10,8 @@ GIT_REPO_URL=https://github.com/bcgov/trust-over-ip-configurations.git GIT_REF=main SOURCE_CONTEXT_DIR=. SOURCE_IMAGE_KIND=DockerImage -SOURCE_IMAGE_REGISTRY=artifacts.developer.gov.bc.ca/docker-remote/ -SOURCE_IMAGE_NAME=bcgovimages/aries-cloudagent -SOURCE_IMAGE_TAG=py36-1.16-1_0.7.4 -# SOURCE_IMAGE_REGISTRY=artifacts.developer.gov.bc.ca/github-docker-remote/ -# SOURCE_IMAGE_NAME=hyperledger/aries-cloudagent-python -# SOURCE_IMAGE_TAG=py3.9-indy-1.16.0-0.8.1 +SOURCE_IMAGE_REGISTRY=artifacts.developer.gov.bc.ca/github-docker-remote/ +SOURCE_IMAGE_NAME=hyperledger/aries-cloudagent-python +SOURCE_IMAGE_TAG=py3.9-0.12.2 DOCKER_FILE_PATH=openshift/templates/issuer-agent/Dockerfile OUTPUT_IMAGE_TAG=latest \ No newline at end of file diff --git a/openshift/templates/issuer-agent/issuer-agent-build.yaml b/openshift/templates/issuer-agent/issuer-agent-build.yaml index 6ed33dc..2b835c1 100644 --- a/openshift/templates/issuer-agent/issuer-agent-build.yaml +++ b/openshift/templates/issuer-agent/issuer-agent-build.yaml @@ -35,9 +35,9 @@ objects: strategy: type: Docker dockerStrategy: - # from: - # kind: ${SOURCE_IMAGE_KIND} - # name: ${SOURCE_IMAGE_REGISTRY}${SOURCE_IMAGE_NAME}:${SOURCE_IMAGE_TAG} + from: + kind: ${SOURCE_IMAGE_KIND} + name: ${SOURCE_IMAGE_REGISTRY}${SOURCE_IMAGE_NAME}:${SOURCE_IMAGE_TAG} dockerfilePath: ${DOCKER_FILE_PATH} output: to: @@ -77,26 +77,26 @@ parameters: description: The source context directory. required: true value: . - # - name: SOURCE_IMAGE_KIND - # displayName: Source Image Kind - # description: The 'kind' (type) of the source image; typically ImageStreamTag, or DockerImage. - # required: true - # value: DockerImage - # - name: SOURCE_IMAGE_REGISTRY - # displayName: Source Image Registry - # description: The name of the Source Image Registry. - # required: false - # value: artifacts.developer.gov.bc.ca/github-docker-remote/ - # - name: SOURCE_IMAGE_NAME - # displayName: Source Image Name - # description: The name of the source image. - # required: true - # value: hyperledger/aries-cloudagent-python - # - name: SOURCE_IMAGE_TAG - # displayName: Source Image Tag - # description: The tag of the source image. - # required: true - # value: py3.9-indy-1.16.0-0.8.1 + - name: SOURCE_IMAGE_KIND + displayName: Source Image Kind + description: The 'kind' (type) of the source image; typically ImageStreamTag, or DockerImage. + required: true + value: DockerImage + - name: SOURCE_IMAGE_REGISTRY + displayName: Source Image Registry + description: The name of the Source Image Registry. + required: false + value: artifacts.developer.gov.bc.ca/github-docker-remote/ + - name: SOURCE_IMAGE_NAME + displayName: Source Image Name + description: The name of the source image. + required: true + value: hyperledger/aries-cloudagent-python + - name: SOURCE_IMAGE_TAG + displayName: Source Image Tag + description: The tag of the source image. + required: true + value: py3.9-indy-1.16.0-0.8.1 - name: DOCKER_FILE_PATH displayName: Docker File Path description: The path to the docker file defining the build. diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param index 6c68d2a..1abdd47 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-preprod.param @@ -48,6 +48,8 @@ ACAPY_ENDORSER_ALIAS=Endorser ACAPY_AUTO_REQUEST_ENDORSEMENT=true ACAPY_AUTO_WRITE_TRANSACTIONS=true ACAPY_CREATE_REVOCATION_TRANSACTIONS=true +ACAPY_PLUGIN= +ACAPY_PLUGIN_CONFIG= ACAPY_WALLET_TYPE=askar ACAPY_WALLET_STORAGE_TYPE=postgres_storage WALLET_HOST=wallet diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param index 5e0106c..5b5f40a 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-qa.param @@ -50,6 +50,8 @@ ACAPY_AUTO_WRITE_TRANSACTIONS=true ACAPY_CREATE_REVOCATION_TRANSACTIONS=true ACAPY_WALLET_TYPE=askar ACAPY_WALLET_STORAGE_TYPE=postgres_storage +ACAPY_PLUGIN= +ACAPY_PLUGIN_CONFIG= WALLET_HOST=wallet WALLET_HOST_PORT=5432 WALLET_STORAGE_CONFIG={\"url\":\"${POSTGRESQL_WALLET_HOST}:${POSTGRESQL_WALLET_PORT}\",\"max_connections\":5} diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param index b5c75f6..69d2f91 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim-sit.param @@ -48,6 +48,8 @@ ACAPY_ENDORSER_ALIAS=Endorser ACAPY_AUTO_REQUEST_ENDORSEMENT=true ACAPY_AUTO_WRITE_TRANSACTIONS=true ACAPY_CREATE_REVOCATION_TRANSACTIONS=true +ACAPY_PLUGIN= +ACAPY_PLUGIN_CONFIG= ACAPY_WALLET_TYPE=askar ACAPY_WALLET_STORAGE_TYPE=postgres_storage WALLET_HOST=wallet diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.dev.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.dev.param index ebd158b..2039b0f 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.dev.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.dev.param @@ -48,6 +48,8 @@ ACAPY_GENESIS_TRANSACTIONS_LIST=ledgers-candy.yaml # ACAPY_AUTO_REQUEST_ENDORSEMENT=true # ACAPY_AUTO_WRITE_TRANSACTIONS=true # ACAPY_CREATE_REVOCATION_TRANSACTIONS=true +ACAPY_PLUGIN=[rpc.v1_0] +# ACAPY_PLUGIN_CONFIG= # ACAPY_WALLET_TYPE=askar # ACAPY_WALLET_STORAGE_TYPE=postgres_storage # WALLET_HOST=wallet diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param index 2433459..7bf5e6b 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.param @@ -48,6 +48,8 @@ ACAPY_ENDORSER_ALIAS=Endorser ACAPY_AUTO_REQUEST_ENDORSEMENT=true ACAPY_AUTO_WRITE_TRANSACTIONS=true ACAPY_CREATE_REVOCATION_TRANSACTIONS=true +ACAPY_PLUGIN= +ACAPY_PLUGIN_CONFIG= ACAPY_WALLET_TYPE=askar ACAPY_WALLET_STORAGE_TYPE=postgres_storage WALLET_HOST=wallet diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param index d428f3a..30911c6 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.prod.param @@ -48,6 +48,8 @@ ACAPY_GENESIS_TRANSACTIONS_LIST=ledgers-candy.yaml # ACAPY_AUTO_REQUEST_ENDORSEMENT=true # ACAPY_AUTO_WRITE_TRANSACTIONS=true # ACAPY_CREATE_REVOCATION_TRANSACTIONS=true +ACAPY_PLUGIN= +# ACAPY_PLUGIN_CONFIG= # ACAPY_WALLET_TYPE=askar # ACAPY_WALLET_STORAGE_TYPE=postgres_storage # WALLET_HOST=wallet diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.test.param b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.test.param index 7b2dce9..d4d6e6e 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.idim.test.param +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.idim.test.param @@ -48,6 +48,8 @@ ACAPY_GENESIS_TRANSACTIONS_LIST=ledgers-candy.yaml # ACAPY_AUTO_REQUEST_ENDORSEMENT=true # ACAPY_AUTO_WRITE_TRANSACTIONS=true # ACAPY_CREATE_REVOCATION_TRANSACTIONS=true +ACAPY_PLUGIN= +# ACAPY_PLUGIN_CONFIG= # ACAPY_WALLET_TYPE=askar # ACAPY_WALLET_STORAGE_TYPE=postgres_storage # WALLET_HOST=wallet diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.yaml b/openshift/templates/issuer-agent/issuer-agent-deploy.yaml index d024218..cdfc8c0 100644 --- a/openshift/templates/issuer-agent/issuer-agent-deploy.yaml +++ b/openshift/templates/issuer-agent/issuer-agent-deploy.yaml @@ -336,6 +336,11 @@ objects: value: ${ACAPY_AUTO_WRITE_TRANSACTIONS} - name: ACAPY_CREATE_REVOCATION_TRANSACTIONS value: ${ACAPY_CREATE_REVOCATION_TRANSACTIONS} + + - name: ACAPY_PLUGIN + value: ${ACAPY_PLUGIN} + - name: ACAPY_PLUGIN_CONFIG + value: ${ACAPY_PLUGIN_CONFIG} - name: AGENT_WALLET_NAME value: ${NAME}${SUFFIX}-wallet @@ -718,6 +723,20 @@ parameters: value: 'false' # =============================================================================== + # =============================================================================== + # Plugin Configuration + #-------------------------------------------------------------------------------- + - name: ACAPY_PLUGIN + displayName: Plugin list + description: Plugin list + required: false + value: + - name: ACAPY_PLUGIN_CONFIG + displayName: Plugin configuration file + description: Plugin configuration file + required: false + value: + # =============================================================================== # Wallet Configuration #--------------------------------------------------------------------------------