Skip to content

Commit fd96d2f

Browse files
committed
Add HTTPS_PROXY to jenkins solr_builder
1 parent dfcffa0 commit fd96d2f

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

scripts/solr_builder/Dockerfile.olpython

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM openlibrary/olbase:latest
22
ARG PIP_INDEX_URL
3+
ARG HTTPS_PROXY
34

45
ENV PYTHONPATH=/openlibrary:/openlibrary/vendor/infogami
56

scripts/solr_builder/Jenkinsfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ pipeline {
2222
booleanParam(name: 'INDEX_AUTHORS', defaultValue: true, description: 'If true, reindexes authors into solr')
2323
booleanParam(name: 'INDEX_LISTS', defaultValue: true, description: 'If true, reindexes lists into solr')
2424
string(name: 'MAX_CORES', defaultValue: '18', description: 'Max number of simultaneous cores')
25-
string(name: 'PIP_INDEX_URL', defaultValue: '', description: 'Path to custom PIP index (optional)')
25+
string(name: 'PIP_INDEX_URL', defaultValue: '', description: 'Path to custom PIP index (needed on prod)')
26+
string(name: 'HTTPS_PROXY', defaultValue: '', description: 'Proxy for HTTP requests (needed on prod)')
27+
string(name: 'NO_PROXY', defaultValue: 'archive.org,openlibrary.org,.archive.org,.openlibrary.org', description: 'No proxy for these domains')
2628
}
2729
environment {
2830
// The *host* location of Jenkins directory

scripts/solr_builder/compose.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ services:
101101
build:
102102
context: ../..
103103
dockerfile: scripts/solr_builder/Dockerfile.olpython
104+
args:
105+
- PIP_INDEX_URL=${PIP_INDEX_URL:-}
106+
- HTTPS_PROXY=${HTTPS_PROXY:-}
104107
volumes:
105108
# Persistent volume mount for installed git submodules
106109
- ol-vendor:/openlibrary/vendor

0 commit comments

Comments
 (0)