Skip to content

Commit

Permalink
Merge pull request #243 from esune/feat/drpc-issuer
Browse files Browse the repository at this point in the history
Update issuer-agent build to include DRPC plug-in
  • Loading branch information
esune authored Oct 1, 2024
2 parents 0c3b785 + a9b3f3c commit 150ecca
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 31 deletions.
5 changes: 3 additions & 2 deletions openshift/templates/issuer-agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/[email protected]#subdirectory=rpc
9 changes: 3 additions & 6 deletions openshift/templates/issuer-agent/issuer-agent-build.param
Original file line number Diff line number Diff line change
Expand Up @@ -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
46 changes: 23 additions & 23 deletions openshift/templates/issuer-agent/issuer-agent-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions openshift/templates/issuer-agent/issuer-agent-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
#--------------------------------------------------------------------------------
Expand Down

0 comments on commit 150ecca

Please sign in to comment.