Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update issuer-agent build to include DRPC plug-in #243

Merged
merged 5 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
3 changes: 2 additions & 1 deletion openshift/templates/issuer-agent/issuer-agent-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ objects:
--wallet-storage-creds "$(eval echo \"${WALLET_STORAGE_CREDENTIALS}\")"
--seed "${INDY_WALLET_SEED}"
--admin '0.0.0.0' ${ADMIN_INTERFACE_PORT}
$([ ! -z "${AGENT_ADMIN_API_KEY}" ] && echo "--admin-api-key ${AGENT_ADMIN_API_KEY}" || echo "--admin-insecure-mode"));
$([ ! -z "${AGENT_ADMIN_API_KEY}" ] && echo "--admin-api-key ${AGENT_ADMIN_API_KEY}" || echo "--admin-insecure-mode")
--plugin rpc.v1_0);
env:
- name: ACAPY_LABEL
value: ${ACAPY_LABEL}
Expand Down