CNJR-5445: Use conjur edge image from internal registry

cyberark · Sep 13, 2024 · 84d3eb1 · 84d3eb1
1 parent 7b0d8fc
commit 84d3eb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -118,6 +118,9 @@ pipeline {
     }
 
     stage('Run tests and archive test results') {
+      environment {
+        INFRAPOOL_REGISTRY_URL = "registry.tld"
+      }
       steps {
         script {
           lock("api-java-${env.NODE_NAME}") {

diff --git a/bin/test.sh b/bin/test.sh
@@ -5,6 +5,8 @@ source bin/utils.sh
 
 trap finish EXIT
 
+export REGISTRY_URL=${INFRAPOOL_REGISTRY_URL:-"docker.io"}
+
 function main() {
   finish
   runDap

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       POSTGRES_PASSWORD: pa55w0rd
 
   conjur:
-    image: cyberark/conjur:latest
+    image: ${REGISTRY_URL:-docker.io}/cyberark/conjur:edge
     command: server -a cucumber
     environment:
       CONJUR_ACCOUNT: cucumber
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ source bin/utils.sh @@
     trap finish EXIT
+    export REGISTRY_URL=${INFRAPOOL_REGISTRY_URL:-"docker.io"}
     function main() {
       finish
       runDap
@@ Expand Down @@