Skip to content

Commit d2d05ae

Browse files
authored
[ISV-5998] Give OPM access to registry (#828)
* [ISV-5998] Give OPM access to registry
1 parent 879fc1c commit d2d05ae

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

ansible/roles/operator-pipeline/templates/openshift/tasks/build-fbc-scratch-catalog.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,12 @@ spec:
6262
6363
EXTRA_ARGS=""
6464
if [[ "$(workspaces.credentials.bound)" == "true" ]]; then
65-
EXTRA_ARGS+=" --authfile $(workspaces.credentials.path)/.dockerconfigjson"
65+
DOCKERCONFIGJSON="$(workspaces.credentials.path)/.dockerconfigjson"
66+
EXTRA_ARGS+=" --authfile $DOCKERCONFIGJSON"
67+
68+
# OPM reads the config location from env var and cannot be provided as a parameter
69+
# this will expose the config path to the OPM tool
70+
export REGISTRY_AUTH_FILE=$DOCKERCONFIGJSON
6671
fi
6772
6873
# The registry pull-spec is in following format:

ansible/roles/operator-pipeline/templates/openshift/tasks/buildah.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ spec:
6464
optional: true
6565
- name: dockerconfig
6666
description: >-
67-
An optional workspace that allows providing a .docker/config.json file
68-
for Buildah to access the container registry.
69-
The file should be placed at the root of the Workspace with name config.json.
67+
An optional workspace that provides a .dockerconfigjson file
7068
optional: true
7169
results:
7270
- name: IMAGE_DIGEST

0 commit comments

Comments
 (0)