6.1.0.34_1

aerospike · May 10, 2024 · b3581f9 · b3581f9
1 parent 05c47ea
commit b3581f9
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 71 deletions.
diff --git a/bake.hcl b/bake.hcl
@@ -10,60 +10,48 @@
 #------------------------------------ test -----------------------------------
 
 group "test" {
-    targets=["enterprise_debian12_amd64", "enterprise_debian12_arm64", "federal_debian12_amd64", "community_debian12_amd64", "community_debian12_arm64"]
+    targets=["enterprise_debian11_amd64", "federal_debian11_amd64", "community_debian11_amd64"]
 }
 
-target "enterprise_debian12_amd64" {
-    tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.8", "aerospike/aerospike-server-enterprise-amd64:latest"]
+target "enterprise_debian11_amd64" {
+    tags=["aerospike/aerospike-server-enterprise-amd64:6.1.0.34", "aerospike/aerospike-server-enterprise-amd64:latest"]
     platforms=["linux/amd64"]
-    context="./enterprise/debian12"
+    context="./enterprise/debian11"
 }
 
-target "enterprise_debian12_arm64" {
-    tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.8", "aerospike/aerospike-server-enterprise-arm64:latest"]
-    platforms=["linux/arm64"]
-    context="./enterprise/debian12"
-}
-
-target "federal_debian12_amd64" {
-    tags=["aerospike/aerospike-server-federal-amd64:7.0.0.8", "aerospike/aerospike-server-federal-amd64:latest"]
+target "federal_debian11_amd64" {
+    tags=["aerospike/aerospike-server-federal-amd64:6.1.0.34", "aerospike/aerospike-server-federal-amd64:latest"]
     platforms=["linux/amd64"]
-    context="./federal/debian12"
+    context="./federal/debian11"
 }
 
-target "community_debian12_amd64" {
-    tags=["aerospike/aerospike-server-community-amd64:7.0.0.8", "aerospike/aerospike-server-community-amd64:latest"]
+target "community_debian11_amd64" {
+    tags=["aerospike/aerospike-server-community-amd64:6.1.0.34", "aerospike/aerospike-server-community-amd64:latest"]
     platforms=["linux/amd64"]
-    context="./community/debian12"
-}
-
-target "community_debian12_arm64" {
-    tags=["aerospike/aerospike-server-community-arm64:7.0.0.8", "aerospike/aerospike-server-community-arm64:latest"]
-    platforms=["linux/arm64"]
-    context="./community/debian12"
+    context="./community/debian11"
 }
 
 #------------------------------------ push -----------------------------------
 
 group "push" {
-    targets=["enterprise_debian12", "federal_debian12", "community_debian12"]
+    targets=["enterprise_debian11", "federal_debian11", "community_debian11"]
 }
 
-target "enterprise_debian12" {
-    tags=["aerospike/aerospike-server-enterprise:7.0.0.8", "aerospike/aerospike-server-enterprise:7.0.0.8_1", "aerospike/aerospike-server-enterprise:latest"]
-    platforms=["linux/amd64,linux/arm64"]
-    context="./enterprise/debian12"
+target "enterprise_debian11" {
+    tags=["aerospike/aerospike-server-enterprise:6.1.0.34", "aerospike/aerospike-server-enterprise:6.1.0.34_1"]
+    platforms=["linux/amd64"]
+    context="./enterprise/debian11"
 }
 
-target "federal_debian12" {
-    tags=["aerospike/aerospike-server-federal:7.0.0.8", "aerospike/aerospike-server-federal:7.0.0.8_1", "aerospike/aerospike-server-federal:latest"]
+target "federal_debian11" {
+    tags=["aerospike/aerospike-server-federal:6.1.0.34", "aerospike/aerospike-server-federal:6.1.0.34_1"]
     platforms=["linux/amd64"]
-    context="./federal/debian12"
+    context="./federal/debian11"
 }
 
-target "community_debian12" {
-    tags=["aerospike/aerospike-server:7.0.0.8", "aerospike/aerospike-server:7.0.0.8_1", "aerospike/aerospike-server:latest"]
-    platforms=["linux/amd64,linux/arm64"]
-    context="./community/debian12"
+target "community_debian11" {
+    tags=["aerospike/aerospike-server:6.1.0.34", "aerospike/aerospike-server:6.1.0.34_1"]
+    platforms=["linux/amd64"]
+    context="./community/debian11"
 }
 
diff --git a/community/debian12/Dockerfile → community/debian11/Dockerfile b/community/debian12/Dockerfile → community/debian11/Dockerfile
@@ -5,15 +5,15 @@
 # http://github.com/aerospike/aerospike-server.docker
 #
 
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 LABEL org.opencontainers.image.title="Aerospike Community Server" \
       org.opencontainers.image.description="Aerospike is a real-time database with predictable performance at petabyte scale with microsecond latency over billions of transactions." \
       org.opencontainers.image.documentation="https://hub.docker.com/_/aerospike" \
-      org.opencontainers.image.base.name="docker.io/library/debian:bookworm-slim" \
+      org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.0.0.8" \
+      org.opencontainers.image.version="6.1.0.34" \
       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/7.0.0.8/aerospike-server-community_7.0.0.8_tools-10.2.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="54eba8c7c413015b2f9d4571599238e0634ec8b66adf8e65cb9db6be1bdf1980"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.8/aerospike-server-community_7.0.0.8_tools-10.2.1_debian12_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="f4a8106ff23da8f07f1bd7b69b1aea1312fbb73a4dd3f1d8cc70db93b6e63e8e"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.1.0.34/aerospike-server-community-6.1.0.34-debian11.tgz"
+ARG AEROSPIKE_SHA_X86_64="0a4d8dac7115da69902692553ba5a06daae9e5b7548005f28c0534b0cd5d49d1"
+ARG AEROSPIKE_AARCH64_LINK=""
+ARG AEROSPIKE_SHA_AARCH64=""
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/community/debian12/README.md → community/debian11/README.md b/community/debian12/README.md → community/debian11/README.md
diff --git a/federal/debian12/aerospike.template.conf → community/debian11/aerospike.template.conf b/federal/debian12/aerospike.template.conf → community/debian11/aerospike.template.conf
@@ -8,7 +8,6 @@
 # This stanza must come first.
 service {
 	$([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}")
-	cluster-name docker
 }
 
 logging {
@@ -55,14 +54,14 @@ 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 $([ "${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.
+	storage-engine device {
+		data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem
 		file /opt/aerospike/data/${NAMESPACE}.dat
 		filesize ${STORAGE_GB}G
-		$(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}")
+		read-page-cache ${READ_PAGE_CACHE}
 	}
 }
+
diff --git a/community/debian12/entrypoint.sh → community/debian11/entrypoint.sh b/community/debian12/entrypoint.sh → community/debian11/entrypoint.sh
diff --git a/enterprise/debian12/Dockerfile → enterprise/debian11/Dockerfile b/enterprise/debian12/Dockerfile → enterprise/debian11/Dockerfile
@@ -5,15 +5,15 @@
 # http://github.com/aerospike/aerospike-server.docker
 #
 
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \
       org.opencontainers.image.description="Aerospike is a real-time database with predictable performance at petabyte scale with microsecond latency over billions of transactions." \
       org.opencontainers.image.documentation="https://hub.docker.com/_/aerospike" \
-      org.opencontainers.image.base.name="docker.io/library/debian:bookworm-slim" \
+      org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.0.0.8" \
+      org.opencontainers.image.version="6.1.0.34" \
       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/7.0.0.8/aerospike-server-enterprise_7.0.0.8_tools-10.2.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="a092f046debcf70d33c5dc6ed99a89d030a1077b5462119530f531914f63ee6b"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.8/aerospike-server-enterprise_7.0.0.8_tools-10.2.1_debian12_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="686b85375e53e3b6aa1f35d89ecf22ad6677a7b2cc235c8f36b401ab0abf32f3"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.1.0.34/aerospike-server-enterprise-6.1.0.34-debian11.tgz"
+ARG AEROSPIKE_SHA_X86_64="708776a9d482394078f4c2239659651a044e76b72252e8f36ede0492cd573730"
+ARG AEROSPIKE_AARCH64_LINK=""
+ARG AEROSPIKE_SHA_AARCH64=""
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/enterprise/debian12/README.md → enterprise/debian11/README.md b/enterprise/debian12/README.md → enterprise/debian11/README.md
diff --git a/community/debian12/aerospike.template.conf → enterprise/debian11/aerospike.template.conf b/community/debian12/aerospike.template.conf → enterprise/debian11/aerospike.template.conf
@@ -8,7 +8,6 @@
 # This stanza must come first.
 service {
 	$([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}")
-	cluster-name docker
 }
 
 logging {
@@ -55,14 +54,14 @@ 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 $([ "${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.
+	storage-engine device {
+		data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem
 		file /opt/aerospike/data/${NAMESPACE}.dat
 		filesize ${STORAGE_GB}G
-		$(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}")
+		read-page-cache ${READ_PAGE_CACHE}
 	}
 }
+
diff --git a/enterprise/debian12/entrypoint.sh → enterprise/debian11/entrypoint.sh b/enterprise/debian12/entrypoint.sh → enterprise/debian11/entrypoint.sh
diff --git a/federal/debian12/Dockerfile → federal/debian11/Dockerfile b/federal/debian12/Dockerfile → federal/debian11/Dockerfile
@@ -5,15 +5,15 @@
 # http://github.com/aerospike/aerospike-server.docker
 #
 
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 LABEL org.opencontainers.image.title="Aerospike Federal Server" \
       org.opencontainers.image.description="Aerospike is a real-time database with predictable performance at petabyte scale with microsecond latency over billions of transactions." \
       org.opencontainers.image.documentation="https://hub.docker.com/_/aerospike" \
-      org.opencontainers.image.base.name="docker.io/library/debian:bookworm-slim" \
+      org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.0.0.8" \
+      org.opencontainers.image.version="6.1.0.34" \
       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/7.0.0.8/aerospike-server-federal_7.0.0.8_tools-10.2.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="8db0f055c3758976e2795a6f80c9ce9edf4b4e1a1d7411ef54dfa21ad15ad2ed"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/6.1.0.34/aerospike-server-federal-6.1.0.34-debian11.tgz"
+ARG AEROSPIKE_SHA_X86_64="8b9b8236508d72cf7c8748aed9784971fdaa7f104f1d9dfd27ad5802494b8be1"
 ARG AEROSPIKE_AARCH64_LINK=""
 ARG AEROSPIKE_SHA_AARCH64=""
 

diff --git a/federal/debian12/README.md → federal/debian11/README.md b/federal/debian12/README.md → federal/debian11/README.md
diff --git a/enterprise/debian12/aerospike.template.conf → federal/debian11/aerospike.template.conf b/enterprise/debian12/aerospike.template.conf → federal/debian11/aerospike.template.conf
@@ -8,7 +8,6 @@
 # This stanza must come first.
 service {
 	$([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}")
-	cluster-name docker
 }
 
 logging {
@@ -55,14 +54,14 @@ 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 $([ "${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.
+	storage-engine device {
+		data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem
 		file /opt/aerospike/data/${NAMESPACE}.dat
 		filesize ${STORAGE_GB}G
-		$(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}")
+		read-page-cache ${READ_PAGE_CACHE}
 	}
 }
+
diff --git a/federal/debian12/entrypoint.sh → federal/debian11/entrypoint.sh b/federal/debian12/entrypoint.sh → federal/debian11/entrypoint.sh