diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index fb442f57..59ca5c33 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -16,7 +16,7 @@ Development is tested on Ubuntu and OSX. It will probably work on other Linuxes. # Building the Image There are two supported base operating systems that the docker image can be build upon: - * debian, based off `debian:bullseye-slim`. + * debian, based off `debian:bookworm-slim`. * RedHat ubi9, based off `redhat/ubi9-minimal`. Only available for 4.4 onwards. On top of that there is also the choice Neo4j version, and whether to build `community` or `enterprise` edition Neo4j. diff --git a/docker-image-src/5/coredb/Dockerfile-debian b/docker-image-src/5/coredb/Dockerfile-debian index d000dd40..76a4983a 100644 --- a/docker-image-src/5/coredb/Dockerfile-debian +++ b/docker-image-src/5/coredb/Dockerfile-debian @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" \ @@ -21,7 +21,7 @@ RUN apt-get update \ && tar --extract --file ${NEO4J_TARBALL} --directory /var/lib \ && mv /var/lib/neo4j-* "${NEO4J_HOME}" \ && rm ${NEO4J_TARBALL} \ - && sed -i 's/Package Type:.*/Package Type: docker bullseye/' $NEO4J_HOME/packaging_info \ + && sed -i 's/Package Type:.*/Package Type: docker bookworm/' $NEO4J_HOME/packaging_info \ && mv /startup/neo4j-admin-report.sh "${NEO4J_HOME}"/bin/neo4j-admin-report \ && mv "${NEO4J_HOME}"/data /data \ && mv "${NEO4J_HOME}"/logs /logs \ diff --git a/docker-image-src/5/neo4j-admin/Dockerfile-debian b/docker-image-src/5/neo4j-admin/Dockerfile-debian index 4b30485e..4c6afeeb 100644 --- a/docker-image-src/5/neo4j-admin/Dockerfile-debian +++ b/docker-image-src/5/neo4j-admin/Dockerfile-debian @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" \ diff --git a/docker-image-src/calver/coredb/Dockerfile-debian b/docker-image-src/calver/coredb/Dockerfile-debian index 75f8fb80..f2c400a1 100644 --- a/docker-image-src/calver/coredb/Dockerfile-debian +++ b/docker-image-src/calver/coredb/Dockerfile-debian @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" \ @@ -21,7 +21,7 @@ RUN apt-get update \ && tar --extract --file ${NEO4J_TARBALL} --directory /var/lib \ && mv /var/lib/neo4j-* "${NEO4J_HOME}" \ && rm ${NEO4J_TARBALL} \ - && sed -i 's/Package Type:.*/Package Type: docker bullseye/' $NEO4J_HOME/packaging_info \ + && sed -i 's/Package Type:.*/Package Type: docker bookworm/' $NEO4J_HOME/packaging_info \ && mv /startup/neo4j-admin-report.sh "${NEO4J_HOME}"/bin/neo4j-admin-report \ && mv "${NEO4J_HOME}"/data /data \ && mv "${NEO4J_HOME}"/logs /logs \ diff --git a/docker-image-src/calver/neo4j-admin/Dockerfile-debian b/docker-image-src/calver/neo4j-admin/Dockerfile-debian index 31fef7dd..cadbc34e 100644 --- a/docker-image-src/calver/neo4j-admin/Dockerfile-debian +++ b/docker-image-src/calver/neo4j-admin/Dockerfile-debian @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" \ diff --git a/src/test/java/com/neo4j/docker/utils/TestSettings.java b/src/test/java/com/neo4j/docker/utils/TestSettings.java index 7741b870..433a0fb5 100644 --- a/src/test/java/com/neo4j/docker/utils/TestSettings.java +++ b/src/test/java/com/neo4j/docker/utils/TestSettings.java @@ -23,7 +23,7 @@ public enum Edition } public enum BaseOS { - BULLSEYE, + BOOKWORM, UBI9, UBI8; } @@ -78,7 +78,7 @@ private static BaseOS getBaseOS() switch ( os.toLowerCase() ) { case "debian": - return BaseOS.BULLSEYE; + return BaseOS.BOOKWORM; case "ubi9": return BaseOS.UBI9; case "ubi8":