From e622bfcf496ceb86021cc882f29c1d8ec2f378ea Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 5 Jul 2022 17:20:58 +0200 Subject: [PATCH] updated java base image because openjdk is no longer supported --- docker-image-src/3.5/Dockerfile | 8 +++++--- docker-image-src/3.5/neo4j-admin/Dockerfile | 8 +++++--- docker-image-src/4.3/Dockerfile | 8 +++++--- docker-image-src/4.3/neo4j-admin/Dockerfile | 8 +++++--- docker-image-src/4.4/Dockerfile | 8 +++++--- docker-image-src/4.4/neo4j-admin/Dockerfile | 8 +++++--- docker-image-src/5.0/Dockerfile | 8 +++++--- docker-image-src/5.0/neo4j-admin/Dockerfile | 8 +++++--- 8 files changed, 40 insertions(+), 24 deletions(-) diff --git a/docker-image-src/3.5/Dockerfile b/docker-image-src/3.5/Dockerfile index 318c7680..f534e657 100644 --- a/docker-image-src/3.5/Dockerfile +++ b/docker-image-src/3.5/Dockerfile @@ -1,6 +1,8 @@ -FROM openjdk:8-jre-slim - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/3.5/neo4j-admin/Dockerfile b/docker-image-src/3.5/neo4j-admin/Dockerfile index 950489c4..f242b232 100644 --- a/docker-image-src/3.5/neo4j-admin/Dockerfile +++ b/docker-image-src/3.5/neo4j-admin/Dockerfile @@ -1,6 +1,8 @@ -FROM openjdk:8-jre-slim - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/4.3/Dockerfile b/docker-image-src/4.3/Dockerfile index 031be74b..1badc66a 100644 --- a/docker-image-src/4.3/Dockerfile +++ b/docker-image-src/4.3/Dockerfile @@ -1,6 +1,8 @@ -FROM %%NEO4J_BASE_IMAGE%% - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/4.3/neo4j-admin/Dockerfile b/docker-image-src/4.3/neo4j-admin/Dockerfile index 11dfe3af..318883a0 100644 --- a/docker-image-src/4.3/neo4j-admin/Dockerfile +++ b/docker-image-src/4.3/neo4j-admin/Dockerfile @@ -1,6 +1,8 @@ -FROM %%NEO4J_BASE_IMAGE%% - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/4.4/Dockerfile b/docker-image-src/4.4/Dockerfile index cbe7958a..1badc66a 100644 --- a/docker-image-src/4.4/Dockerfile +++ b/docker-image-src/4.4/Dockerfile @@ -1,6 +1,8 @@ -FROM openjdk:11-jdk-slim - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/4.4/neo4j-admin/Dockerfile b/docker-image-src/4.4/neo4j-admin/Dockerfile index 5ec9b436..318883a0 100644 --- a/docker-image-src/4.4/neo4j-admin/Dockerfile +++ b/docker-image-src/4.4/neo4j-admin/Dockerfile @@ -1,6 +1,8 @@ -FROM openjdk:11-jdk-slim - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/5.0/Dockerfile b/docker-image-src/5.0/Dockerfile index 2e4725bb..f396af05 100644 --- a/docker-image-src/5.0/Dockerfile +++ b/docker-image-src/5.0/Dockerfile @@ -1,6 +1,8 @@ -FROM openjdk:17-jdk-slim - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j" diff --git a/docker-image-src/5.0/neo4j-admin/Dockerfile b/docker-image-src/5.0/neo4j-admin/Dockerfile index a33f2890..f651f166 100644 --- a/docker-image-src/5.0/neo4j-admin/Dockerfile +++ b/docker-image-src/5.0/neo4j-admin/Dockerfile @@ -1,6 +1,8 @@ -FROM openjdk:17-jdk-slim - -ENV NEO4J_SHA256=%%NEO4J_SHA%% \ +FROM debian:bullseye-slim +ENV JAVA_HOME=/opt/java/openjdk +COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME +ENV PATH="${JAVA_HOME}/bin:${PATH}" \ + NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ NEO4J_EDITION=%%NEO4J_EDITION%% \ NEO4J_HOME="/var/lib/neo4j"