You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2022/10/21 16:49:56 UTC

[solr-docker] branch main updated: Use focal variant of eclipse-temurin images (#13)

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-docker.git


The following commit(s) were added to refs/heads/main by this push:
     new 4649370  Use focal variant of eclipse-temurin images (#13)
4649370 is described below

commit 46493704912ffeb3e70d2d9fb91701089e65b8e1
Author: Eva Müller <em...@coremedia.com>
AuthorDate: Fri Oct 21 18:49:51 2022 +0200

    Use focal variant of eclipse-temurin images (#13)
    
    Focal variant is required to run the image with Docker < 20.10.16
    Also it is important to pin the major linux version within same Solr minor version
---
 8.11-slim/Dockerfile | 3 ++-
 8.11/Dockerfile      | 3 ++-
 9.0/Dockerfile       | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/8.11-slim/Dockerfile b/8.11-slim/Dockerfile
index f4d9b9a..da02f62 100644
--- a/8.11-slim/Dockerfile
+++ b/8.11-slim/Dockerfile
@@ -1,5 +1,6 @@
 # Patched 2022-10-20 to change from openjdk:11-jre-slim to eclipse-temurin:11-jre
-FROM eclipse-temurin:11-jre
+# Patched 2022-10-21 to use eclipse-temurin:11-jre-focal which used Ubuntu 20.04, compatible with Docker client < 20.10.16
+FROM eclipse-temurin:11-jre-focal
 
 LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
diff --git a/8.11/Dockerfile b/8.11/Dockerfile
index ce66c2d..b9f5645 100644
--- a/8.11/Dockerfile
+++ b/8.11/Dockerfile
@@ -1,5 +1,6 @@
 # Patched 2022-10-20 to change from openjdk:11-jre to eclipse-temurin:11-jre
-FROM eclipse-temurin:11-jre
+# Patched 2022-10-21 to use eclipse-temurin:11-jre-focal which used Ubuntu 20.04, compatible with Docker client < 20.10.16
+FROM eclipse-temurin:11-jre-focal
 
 LABEL maintainer="The Apache Lucene/Solr Project"
 LABEL repository="https://github.com/docker-solr/docker-solr"
diff --git a/9.0/Dockerfile b/9.0/Dockerfile
index 3385313..b91f112 100644
--- a/9.0/Dockerfile
+++ b/9.0/Dockerfile
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-FROM eclipse-temurin:17-jre
+# Patched 2022-10-21 to use eclipse-temurin:11-jre-focal which used Ubuntu 20.04, compatible with Docker client  < 20.10.16
+FROM eclipse-temurin:17-jre-focal
 
 # TODO: remove things that exist solely for downstream specialization since Dockerfile.local now exists for that