Switch solr_builder to use docker hub image

This avoids a lot of the nexus/proxy/apt mirror restrictions
internetarchive · Feb 11, 2025 · 8f2dc48 · 8f2dc48
1 parent 0045f02
commit 8f2dc48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scripts/solr_builder/Dockerfile b/scripts/solr_builder/Dockerfile
@@ -1,4 +1,8 @@
 ## This image is where we should execute the Jenkins commands
+# WARNING: This image is pushed up to openlibrary/solrbuilder _manually_ . Changes
+# made to this file WILL NOT be automatically used, you have to manually rebuild/push:
+# docker build -t openlibrary/solr-builder:latest .
+# docker push openlibrary/solr-builder:latest
 
 FROM ubuntu:jammy
 ARG DOCKER_VERSION=5:20.10.23~3-0~ubuntu-jammy

diff --git a/scripts/solr_builder/Jenkinsfile b/scripts/solr_builder/Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
   agent {
-    dockerfile {
-      filename 'Dockerfile'
-      dir 'scripts/solr_builder'
+    docker {
+      // filename 'Dockerfile'
+      image 'openlibrary/solr-builder:latest'
       // Needed to make docker-in-docker work
       args '-v /var/run/docker.sock:/var/run/docker.sock'
       args '-v /var/lib/docker/volumes/jenkins-data:/var/lib/docker/volumes/jenkins-data'