7.0.0.20_1

aerospike · Jan 3, 2025 · 50b0ac9 · 50b0ac9
1 parent 0e1f526
commit 50b0ac9
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 42 deletions.
diff --git a/bake.hcl b/bake.hcl
@@ -14,31 +14,31 @@ group "test" {
 }
 
 target "enterprise_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-enterprise-amd64:6.4.0.28", "aerospike/aerospike-server-enterprise-amd64:latest"]
+    tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.20", "aerospike/aerospike-server-enterprise-amd64:latest"]
     platforms=["linux/amd64"]
     context="./enterprise/ubuntu22.04"
 }
 
 target "enterprise_ubuntu22-04_arm64" {
-    tags=["aerospike/aerospike-server-enterprise-arm64:6.4.0.28", "aerospike/aerospike-server-enterprise-arm64:latest"]
+    tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.20", "aerospike/aerospike-server-enterprise-arm64:latest"]
     platforms=["linux/arm64"]
     context="./enterprise/ubuntu22.04"
 }
 
 target "federal_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-federal-amd64:6.4.0.28", "aerospike/aerospike-server-federal-amd64:latest"]
+    tags=["aerospike/aerospike-server-federal-amd64:7.0.0.20", "aerospike/aerospike-server-federal-amd64:latest"]
     platforms=["linux/amd64"]
     context="./federal/ubuntu22.04"
 }
 
 target "community_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-community-amd64:6.4.0.28", "aerospike/aerospike-server-community-amd64:latest"]
+    tags=["aerospike/aerospike-server-community-amd64:7.0.0.20", "aerospike/aerospike-server-community-amd64:latest"]
     platforms=["linux/amd64"]
     context="./community/ubuntu22.04"
 }
 
 target "community_ubuntu22-04_arm64" {
-    tags=["aerospike/aerospike-server-community-arm64:6.4.0.28", "aerospike/aerospike-server-community-arm64:latest"]
+    tags=["aerospike/aerospike-server-community-arm64:7.0.0.20", "aerospike/aerospike-server-community-arm64:latest"]
     platforms=["linux/arm64"]
     context="./community/ubuntu22.04"
 }
@@ -50,19 +50,19 @@ group "push" {
 }
 
 target "enterprise_ubuntu22-04" {
-    tags=["aerospike/aerospike-server-enterprise:6.4.0.28", "aerospike/aerospike-server-enterprise:6.4.0.28_1"]
+    tags=["aerospike/aerospike-server-enterprise:7.0.0.20", "aerospike/aerospike-server-enterprise:7.0.0.20_1"]
     platforms=["linux/amd64,linux/arm64"]
     context="./enterprise/ubuntu22.04"
 }
 
 target "federal_ubuntu22-04" {
-    tags=["aerospike/aerospike-server-federal:6.4.0.28", "aerospike/aerospike-server-federal:6.4.0.28_1"]
+    tags=["aerospike/aerospike-server-federal:7.0.0.20", "aerospike/aerospike-server-federal:7.0.0.20_1"]
     platforms=["linux/amd64"]
     context="./federal/ubuntu22.04"
 }
 
 target "community_ubuntu22-04" {
-    tags=["aerospike/aerospike-server:6.4.0.28", "aerospike/aerospike-server:6.4.0.28_1"]
+    tags=["aerospike/aerospike-server:7.0.0.20", "aerospike/aerospike-server:7.0.0.20_1"]
     platforms=["linux/amd64,linux/arm64"]
     context="./community/ubuntu22.04"
 }

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.28" \
+      org.opencontainers.image.version="7.0.0.20" \
       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.28/aerospike-server-community_6.4.0.28_tools-10.0.0_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="fec372fc37ad45011fec511ad3cbe9b4f7bc5a8105afba9ef2cc9c5ae68324a9"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.28/aerospike-server-community_6.4.0.28_tools-10.0.0_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="f8011b4ac38ce385a2f2237591d56c9aa9e55d8c8265354c89dadb46b4cee91f"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.20/aerospike-server-community_7.0.0.20_tools-10.2.1_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="2c1149f752bea075ff767afd7df4603f0bd3764d0ae7ab3cf3da236e0766f523"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.20/aerospike-server-community_7.0.0.20_tools-10.2.1_ubuntu22.04_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="3842ea79f6de3f68087cac66a504cc588979a11ae34454585e25cbb8df227ec4"
 
 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.28" \
+      org.opencontainers.image.version="7.0.0.20" \
       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.28/aerospike-server-enterprise_6.4.0.28_tools-10.0.0_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="bd396e1e7978ce9a0da3f510294b488c9d8922d9785914fd94e8500c3c01f7e0"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.28/aerospike-server-enterprise_6.4.0.28_tools-10.0.0_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="e22162dfbd6fade90492103dc4b88a93ab9a079b50ea3aa26d8cbc3ba299392b"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.20/aerospike-server-enterprise_7.0.0.20_tools-10.2.1_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="7d9fa2d22cf36cc7d9463c74b8d3f0dedc2e509334887df61dbf3781f6e11b66"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.20/aerospike-server-enterprise_7.0.0.20_tools-10.2.1_ubuntu22.04_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="372649504e3f00bb6210f8c7e038ef68a7a5b918791414ba829183b420c0c2fc"
 
 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.28" \
+      org.opencontainers.image.version="7.0.0.20" \
       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.28/aerospike-server-federal_6.4.0.28_tools-10.0.0_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="9b15012ad78b6cb94dc6ee99c7ea753bdd489b5ee115788de437b38a25ec8bf3"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.20/aerospike-server-federal_7.0.0.20_tools-10.2.1_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="31b960a849dd13e62ba629af92a004e3502b492dacd0e03683452abcf6757040"
 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}")
 	}
 }
-