Add HTTPS_PROXY to jenkins solr_builder

internetarchive · Mar 6, 2025 · 79e715f · 79e715f
1 parent dfcffa0
commit 79e715f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/scripts/solr_builder/Dockerfile.olpython b/scripts/solr_builder/Dockerfile.olpython
@@ -1,5 +1,6 @@
 FROM openlibrary/olbase:latest
 ARG PIP_INDEX_URL
+ARG HTTPS_PROXY
 
 ENV PYTHONPATH=/openlibrary:/openlibrary/vendor/infogami
 

diff --git a/scripts/solr_builder/Jenkinsfile b/scripts/solr_builder/Jenkinsfile
@@ -22,7 +22,8 @@ pipeline {
     booleanParam(name: 'INDEX_AUTHORS', defaultValue: true, description: 'If true, reindexes authors into solr')
     booleanParam(name: 'INDEX_LISTS', defaultValue: true, description: 'If true, reindexes lists into solr')
     string(name: 'MAX_CORES', defaultValue: '18', description: 'Max number of simultaneous cores')
-    string(name: 'PIP_INDEX_URL', defaultValue: '', description: 'Path to custom PIP index (optional)')
+    string(name: 'PIP_INDEX_URL', defaultValue: '', description: 'Path to custom PIP index (needed on prod)')
+    string(name: 'HTTPS_PROXY', defaultValue: '', description: 'Proxy for HTTP requests (needed on prod)')
   }
   environment {
     // The *host* location of Jenkins directory

diff --git a/scripts/solr_builder/compose.yaml b/scripts/solr_builder/compose.yaml
@@ -101,6 +101,9 @@ services:
     build:
       context: ../..
       dockerfile: scripts/solr_builder/Dockerfile.olpython
+      args:
+        - PIP_INDEX_URL=${PIP_INDEX_URL:-}
+        - HTTPS_PROXY=${HTTPS_PROXY:-}
     volumes:
       # Persistent volume mount for installed git submodules
       - ol-vendor:/openlibrary/vendor