You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2021/11/30 15:43:22 UTC
[solr] branch main updated: SOLR-15808: Remove the GITHUB_URL arg from the docker build (#425)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 52d8e2c SOLR-15808: Remove the GITHUB_URL arg from the docker build (#425)
52d8e2c is described below
commit 52d8e2cb2e9e61b37391e41e83ee6592c12b32c5
Author: Houston Putman <ho...@apache.org>
AuthorDate: Tue Nov 30 10:43:16 2021 -0500
SOLR-15808: Remove the GITHUB_URL arg from the docker build (#425)
---
solr/docker/build.gradle | 6 +-----
solr/docker/gradle-help.txt | 5 -----
solr/docker/templates/Dockerfile.body.template | 3 ---
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index 367c9d5..c2ed014 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -28,7 +28,6 @@ def dockerImageRepo = propertyOrEnvOrDefault("solr.docker.imageRepo", "SOLR_DOCK
def 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')
def releaseGpgFingerprint = propertyOrDefault('signing.gnupg.keyName','');
@@ -111,8 +110,7 @@ task dockerBuild(dependsOn: configurations.solrTgz) {
// Ensure that the docker image is rebuilt on build-arg changes or changes in the docker context
inputs.properties([
- baseDockerImage: baseDockerImage,
- githubUrlOrMirror: githubUrlOrMirror
+ baseDockerImage: baseDockerImage
])
inputs.files(configurations.solrTgz)
@@ -123,7 +121,6 @@ task dockerBuild(dependsOn: configurations.solrTgz) {
"-f", "solr-${version}/docker/Dockerfile.local",
"--iidfile", imageIdFile,
"--build-arg", "BASE_IMAGE=${inputs.properties.baseDockerImage}",
- "--build-arg", "GITHUB_URL=${inputs.properties.githubUrlOrMirror}",
"-"
}
}
@@ -393,7 +390,6 @@ task testBuildDockerfileOfficial(type: Copy) {
"--iidfile", imageIdFileOfficial,
'--build-arg', "SOLR_CLOSER_URL=http://mock-solr-dl-server:9876/solr-${version}.tgz",
'--build-arg', "SOLR_ARCHIVE_URL=http://mock-solr-dl-server:9876/solr-${version}.tgz",
- "--build-arg", "GITHUB_URL=${githubUrlOrMirror}",
'-'
}
diff --git a/solr/docker/gradle-help.txt b/solr/docker/gradle-help.txt
index 868a9e6..765fd44 100644
--- a/solr/docker/gradle-help.txt
+++ b/solr/docker/gradle-help.txt
@@ -21,11 +21,6 @@ Base Docker Image: (The docker image used for the "FROM" in the Solr Dockerfile)
EnvVar: SOLR_DOCKER_BASE_IMAGE
Gradle 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
-
Tagging and Pushing
-------
diff --git a/solr/docker/templates/Dockerfile.body.template b/solr/docker/templates/Dockerfile.body.template
index 82cdcdc..df6942a 100644
--- a/solr/docker/templates/Dockerfile.body.template
+++ b/solr/docker/templates/Dockerfile.body.template
@@ -37,9 +37,6 @@ RUN set -ex; \
LABEL maintainer="The Apache Lucene/Solr Project"
LABEL repository="https://github.com/apache/lucene-solr"
-
-# Override the default github URL to provide a mirror for github releases.
-ARG GITHUB_URL=github.com
RUN set -ex; \
apt-get update; \