7.0.0.19_1

aerospike · Nov 21, 2024 · 72854b6 · 72854b6
1 parent c46afda
commit 72854b6
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 34 deletions.
diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu22.04/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Community Server" \
       org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="6.4.0.27" \
+      org.opencontainers.image.version="7.0.0.19" \
       org.opencontainers.image.url="https://github.com/aerospike/aerospike-server.docker"
 
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
@@ -23,10 +23,10 @@ LABEL org.opencontainers.image.title="Aerospike Community Server" \
 # By selecting "federal" you agree to the "FEDERAL_LICENSE"
 ARG AEROSPIKE_EDITION="community"
 
-ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.27/aerospike-server-community_6.4.0.27_tools-10.0.0_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="e0f076407345692084990a0dbad3af70f97932dd144d6cb6915bed7150680f54"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.27/aerospike-server-community_6.4.0.27_tools-10.0.0_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="7c80660f19cfcc344056041ee91a44e3444cb0c0eb31cb881848932b92f84e84"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.19/aerospike-server-community_7.0.0.19_tools-10.2.1_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="05f3fea74fc7af388a8ee5bbae76bbe015ef9a88237ed9470be0f8293e14a64a"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.19/aerospike-server-community_7.0.0.19_tools-10.2.1_ubuntu22.04_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="4d04ce62c3dfc0d11871ca7395ee142bf246574e102e8bf081b08f1c214780b6"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/community/ubuntu22.04/aerospike.template.conf b/community/ubuntu22.04/aerospike.template.conf
@@ -8,6 +8,7 @@
 # This stanza must come first.
 service {
 	$([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}")
+	cluster-name docker
 }
 
 logging {
@@ -53,15 +54,16 @@ network {
 }
 
 namespace ${NAMESPACE} {
-	default-ttl ${DEFAULT_TTL} # use 0 to never expire/evict.
-	memory-size ${MEM_GB}G
-	nsup-period ${NSUP_PERIOD}
 	replication-factor 1
-	storage-engine device {
-		data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem
+	$( [[ "DEFAULT_TTL" != "0" ]] && echo "default-ttl ${DEFAULT_TTL}")
+	$( [[ "DEFAULT_TTL" != "0" ]] && echo "nsup-period ${NSUP_PERIOD}")
+
+	storage-engine $([ "${DATA_IN_MEMORY}" = "true" ] && echo "memory" || echo "device") {
+		# For 'storage-engine memory' with 'device' or 'file' backing, we
+		# recommend having multiple devices (eight is recommended). One is used
+		# here for backward compatibility.
 		file /opt/aerospike/data/${NAMESPACE}.dat
 		filesize ${STORAGE_GB}G
-		read-page-cache ${READ_PAGE_CACHE}
+		$(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}")
 	}
 }
-
diff --git a/enterprise/ubuntu22.04/Dockerfile b/enterprise/ubuntu22.04/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \
       org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="6.4.0.27" \
+      org.opencontainers.image.version="7.0.0.19" \
       org.opencontainers.image.url="https://github.com/aerospike/aerospike-server.docker"
 
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
@@ -23,10 +23,10 @@ LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \
 # By selecting "federal" you agree to the "FEDERAL_LICENSE"
 ARG AEROSPIKE_EDITION="enterprise"
 
-ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.27/aerospike-server-enterprise_6.4.0.27_tools-10.0.0_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="d8a745cd2e6ae593807856db13e8356b50bdc6225bcaa793e779936bcb26a81c"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.27/aerospike-server-enterprise_6.4.0.27_tools-10.0.0_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="d410a4f79b4f335520b8f9d43eb001128f5b90aeb657c2c8cc5724c63fa6d4b3"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.19/aerospike-server-enterprise_7.0.0.19_tools-10.2.1_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="01a3284a0a8ea0a8b08bfb464147c029ddd592e4bcc0ccdb2f22635aaff1000e"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.19/aerospike-server-enterprise_7.0.0.19_tools-10.2.1_ubuntu22.04_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="c8c6c098f05aae963e3c5f48b9be1d9bc902173c8090036279f8e3751e2096ff"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/enterprise/ubuntu22.04/aerospike.template.conf b/enterprise/ubuntu22.04/aerospike.template.conf
@@ -8,6 +8,7 @@
 # This stanza must come first.
 service {
 	$([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}")
+	cluster-name docker
 }
 
 logging {
@@ -53,15 +54,16 @@ network {
 }
 
 namespace ${NAMESPACE} {
-	default-ttl ${DEFAULT_TTL} # use 0 to never expire/evict.
-	memory-size ${MEM_GB}G
-	nsup-period ${NSUP_PERIOD}
 	replication-factor 1
-	storage-engine device {
-		data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem
+	$( [[ "DEFAULT_TTL" != "0" ]] && echo "default-ttl ${DEFAULT_TTL}")
+	$( [[ "DEFAULT_TTL" != "0" ]] && echo "nsup-period ${NSUP_PERIOD}")
+
+	storage-engine $([ "${DATA_IN_MEMORY}" = "true" ] && echo "memory" || echo "device") {
+		# For 'storage-engine memory' with 'device' or 'file' backing, we
+		# recommend having multiple devices (eight is recommended). One is used
+		# here for backward compatibility.
 		file /opt/aerospike/data/${NAMESPACE}.dat
 		filesize ${STORAGE_GB}G
-		read-page-cache ${READ_PAGE_CACHE}
+		$(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}")
 	}
 }
-
diff --git a/federal/ubuntu22.04/Dockerfile b/federal/ubuntu22.04/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Federal Server" \
       org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="6.4.0.27" \
+      org.opencontainers.image.version="7.0.0.19" \
       org.opencontainers.image.url="https://github.com/aerospike/aerospike-server.docker"
 
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
@@ -23,8 +23,8 @@ LABEL org.opencontainers.image.title="Aerospike Federal Server" \
 # By selecting "federal" you agree to the "FEDERAL_LICENSE"
 ARG AEROSPIKE_EDITION="federal"
 
-ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/6.4.0.27/aerospike-server-federal_6.4.0.27_tools-10.0.0_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="41ae2576834a67f96dc19512ae708005602823344fbf521b181c0c3696ebc8e9"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.19/aerospike-server-federal_7.0.0.19_tools-10.2.1_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="bb3f0fcea4ec8cb36c1d9871a1b56b4a3750ee8c6894ef1711c91eaa56cb8eba"
 ARG AEROSPIKE_AARCH64_LINK=""
 ARG AEROSPIKE_SHA_AARCH64=""
 

diff --git a/federal/ubuntu22.04/aerospike.template.conf b/federal/ubuntu22.04/aerospike.template.conf
@@ -8,6 +8,7 @@
 # This stanza must come first.
 service {
 	$([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}")
+	cluster-name docker
 }
 
 logging {
@@ -53,15 +54,16 @@ network {
 }
 
 namespace ${NAMESPACE} {
-	default-ttl ${DEFAULT_TTL} # use 0 to never expire/evict.
-	memory-size ${MEM_GB}G
-	nsup-period ${NSUP_PERIOD}
 	replication-factor 1
-	storage-engine device {
-		data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem
+	$( [[ "DEFAULT_TTL" != "0" ]] && echo "default-ttl ${DEFAULT_TTL}")
+	$( [[ "DEFAULT_TTL" != "0" ]] && echo "nsup-period ${NSUP_PERIOD}")
+
+	storage-engine $([ "${DATA_IN_MEMORY}" = "true" ] && echo "memory" || echo "device") {
+		# For 'storage-engine memory' with 'device' or 'file' backing, we
+		# recommend having multiple devices (eight is recommended). One is used
+		# here for backward compatibility.
 		file /opt/aerospike/data/${NAMESPACE}.dat
 		filesize ${STORAGE_GB}G
-		read-page-cache ${READ_PAGE_CACHE}
+		$(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}")
 	}
 }
-