Apache Solr open-source search software
SOLR-14949: Adding githubUrl option for docker build. (#2074)
Houston Putmand65041359ea1
diff --git a/help/docker.txt b/help/docker.txtindex 8438713d8cd..c86572cd6db 100644--- a/help/docker.txt+++ b/help/docker.txt@@ -37,6 +37,11 @@ Base Docker Image: (The docker image used for the "FROM" in the Solr Dockerfile)EnvVar: SOLR_DOCKER_BASE_IMAGEGradle Property: -Psolr.docker.baseImage+Github URL or Mirror: (The URL of github or a mirror of github releases. This is of use when building the docker image behind a firewall that does not have access to external Github.)+ Default: "github.com"+ EnvVar: SOLR_DOCKER_GITHUB_URL+ Gradle Property: -Psolr.docker.githubUrl+Testing-------diff --git a/solr/docker/build.gradle b/solr/docker/build.gradleindex 0aaefffad05..d6e80accb0b 100644--- a/solr/docker/build.gradle+++ b/solr/docker/build.gradle@@ -38,11 +38,12 @@ def dockerImageRepo = propertyOrEnvOrDefault("solr.docker.imageRepo", "SOLR_DOCKdef dockerImageTag = propertyOrEnvOrDefault("solr.docker.imageTag", "SOLR_DOCKER_IMAGE_TAG", "${version}")def dockerImageName = propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}")def baseDockerImage = propertyOrEnvOrDefault("solr.docker.baseImage", "SOLR_DOCKER_BASE_IMAGE", 'openjdk:11-jre-slim')+def githubUrlOrMirror = propertyOrEnvOrDefault("solr.docker.githubUrl", "SOLR_DOCKER_GITHUB_URL", 'github.com')docker {name = dockerImageNamefiles file('include')- buildArgs(['BASE_IMAGE' : baseDockerImage, 'SOLR_PACKAGE_IMAGE' : 'apache/solr-build:local-package', 'SOLR_VERSION': "${version}"])+ buildArgs(['BASE_IMAGE' : baseDockerImage, 'SOLR_PACKAGE_IMAGE' : 'apache/solr-build:local-package', 'SOLR_VERSION': "${version}", 'GITHUB_URL': githubUrlOrMirror])}tasks.docker {