6.1.0.40_1

aerospike · Sep 14, 2024 · d83b4e3 · d83b4e3
1 parent ea12c2c
commit d83b4e3
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_ubuntu22-04_amd64", "enterprise_ubuntu22-04_arm64", "federal_ubuntu22-04_amd64", "community_ubuntu22-04_amd64", "community_ubuntu22-04_arm64"]
+    targets=["enterprise_ubuntu20-04_amd64", "federal_ubuntu20-04_amd64", "community_ubuntu20-04_amd64"]
 }
 
-target "enterprise_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-enterprise-amd64:7.1.0.5", "aerospike/aerospike-server-enterprise-amd64:latest"]
+target "enterprise_ubuntu20-04_amd64" {
+    tags=["aerospike/aerospike-server-enterprise-amd64:6.1.0.40", "aerospike/aerospike-server-enterprise-amd64:latest"]
     platforms=["linux/amd64"]
-    context="./enterprise/ubuntu22.04"
+    context="./enterprise/ubuntu20.04"
 }
 
-target "enterprise_ubuntu22-04_arm64" {
-    tags=["aerospike/aerospike-server-enterprise-arm64:7.1.0.5", "aerospike/aerospike-server-enterprise-arm64:latest"]
-    platforms=["linux/arm64"]
-    context="./enterprise/ubuntu22.04"
-}
-
-target "federal_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-federal-amd64:7.1.0.5", "aerospike/aerospike-server-federal-amd64:latest"]
+target "federal_ubuntu20-04_amd64" {
+    tags=["aerospike/aerospike-server-federal-amd64:6.1.0.40", "aerospike/aerospike-server-federal-amd64:latest"]
     platforms=["linux/amd64"]
-    context="./federal/ubuntu22.04"
+    context="./federal/ubuntu20.04"
 }
 
-target "community_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-community-amd64:7.1.0.5", "aerospike/aerospike-server-community-amd64:latest"]
+target "community_ubuntu20-04_amd64" {
+    tags=["aerospike/aerospike-server-community-amd64:6.1.0.40", "aerospike/aerospike-server-community-amd64:latest"]
     platforms=["linux/amd64"]
-    context="./community/ubuntu22.04"
-}
-
-target "community_ubuntu22-04_arm64" {
-    tags=["aerospike/aerospike-server-community-arm64:7.1.0.5", "aerospike/aerospike-server-community-arm64:latest"]
-    platforms=["linux/arm64"]
-    context="./community/ubuntu22.04"
+    context="./community/ubuntu20.04"
 }
 
 #------------------------------------ push -----------------------------------
 
 group "push" {
-    targets=["enterprise_ubuntu22-04", "federal_ubuntu22-04", "community_ubuntu22-04"]
+    targets=["enterprise_ubuntu20-04", "federal_ubuntu20-04", "community_ubuntu20-04"]
 }
 
-target "enterprise_ubuntu22-04" {
-    tags=["aerospike/aerospike-server-enterprise:7.1.0.5", "aerospike/aerospike-server-enterprise:7.1.0.5_1", "aerospike/aerospike-server-enterprise:latest"]
-    platforms=["linux/amd64,linux/arm64"]
-    context="./enterprise/ubuntu22.04"
+target "enterprise_ubuntu20-04" {
+    tags=["aerospike/aerospike-server-enterprise:6.1.0.40", "aerospike/aerospike-server-enterprise:6.1.0.40_1"]
+    platforms=["linux/amd64"]
+    context="./enterprise/ubuntu20.04"
 }
 
-target "federal_ubuntu22-04" {
-    tags=["aerospike/aerospike-server-federal:7.1.0.5", "aerospike/aerospike-server-federal:7.1.0.5_1", "aerospike/aerospike-server-federal:latest"]
+target "federal_ubuntu20-04" {
+    tags=["aerospike/aerospike-server-federal:6.1.0.40", "aerospike/aerospike-server-federal:6.1.0.40_1"]
     platforms=["linux/amd64"]
-    context="./federal/ubuntu22.04"
+    context="./federal/ubuntu20.04"
 }
 
-target "community_ubuntu22-04" {
-    tags=["aerospike/aerospike-server:7.1.0.5", "aerospike/aerospike-server:7.1.0.5_1", "aerospike/aerospike-server:latest"]
-    platforms=["linux/amd64,linux/arm64"]
-    context="./community/ubuntu22.04"
+target "community_ubuntu20-04" {
+    tags=["aerospike/aerospike-server:6.1.0.40", "aerospike/aerospike-server:6.1.0.40_1"]
+    platforms=["linux/amd64"]
+    context="./community/ubuntu20.04"
 }
 
diff --git a/community/ubuntu22.04/Dockerfile → community/ubuntu20.04/Dockerfile b/community/ubuntu22.04/Dockerfile → community/ubuntu20.04/Dockerfile
@@ -5,15 +5,15 @@
 # http://github.com/aerospike/aerospike-server.docker
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 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/ubuntu:22.04" \
+      org.opencontainers.image.base.name="docker.io/library/ubuntu:20.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.1.0.5" \
+      org.opencontainers.image.version="6.1.0.40" \
       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.1.0.5/aerospike-server-community_7.1.0.5_tools-11.0.2_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="fdd8f48724872f024a787ececb1f8e21f15de74c82082bba840cf69f5ec2730c"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.1.0.5/aerospike-server-community_7.1.0.5_tools-11.0.2_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="0761c2b8a9cc84988aef5e988fc1eede1b62a56e9eac90d96dbc91dd35884c1b"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.1.0.40/aerospike-server-community-6.1.0.40-ubuntu20.04.tgz"
+ARG AEROSPIKE_SHA_X86_64="a9cf9a207631522715aedc9dc0860bf7f3fa4cc879e61f9fd2915b0bb15d1faa"
+ARG AEROSPIKE_AARCH64_LINK=""
+ARG AEROSPIKE_SHA_AARCH64=""
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/community/ubuntu22.04/README.md → community/ubuntu20.04/README.md b/community/ubuntu22.04/README.md → community/ubuntu20.04/README.md
diff --git a/federal/ubuntu22.04/aerospike.template.conf → ...unity/ubuntu20.04/aerospike.template.conf b/federal/ubuntu22.04/aerospike.template.conf → ...unity/ubuntu20.04/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/ubuntu22.04/entrypoint.sh → community/ubuntu20.04/entrypoint.sh b/community/ubuntu22.04/entrypoint.sh → community/ubuntu20.04/entrypoint.sh
diff --git a/enterprise/ubuntu22.04/Dockerfile → enterprise/ubuntu20.04/Dockerfile b/enterprise/ubuntu22.04/Dockerfile → enterprise/ubuntu20.04/Dockerfile
@@ -5,15 +5,15 @@
 # http://github.com/aerospike/aerospike-server.docker
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 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/ubuntu:22.04" \
+      org.opencontainers.image.base.name="docker.io/library/ubuntu:20.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.1.0.5" \
+      org.opencontainers.image.version="6.1.0.40" \
       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.1.0.5/aerospike-server-enterprise_7.1.0.5_tools-11.0.2_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="bef2f083ebf55ef57bb333d316763f691f7cb20dea3f82ee086c39731143e580"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.1.0.5/aerospike-server-enterprise_7.1.0.5_tools-11.0.2_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="6ae4e5cc3a5705e0291b9c99e5368243fe2bce6a002084b40680cf398c85d8af"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.1.0.40/aerospike-server-enterprise-6.1.0.40-ubuntu20.04.tgz"
+ARG AEROSPIKE_SHA_X86_64="f187f4ada4aeb5a0b008e978f0ee9a593d7c93dffa2ad07f9f082558d2f50e04"
+ARG AEROSPIKE_AARCH64_LINK=""
+ARG AEROSPIKE_SHA_AARCH64=""
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 

diff --git a/enterprise/ubuntu22.04/README.md → enterprise/ubuntu20.04/README.md b/enterprise/ubuntu22.04/README.md → enterprise/ubuntu20.04/README.md
diff --git a/...unity/ubuntu22.04/aerospike.template.conf → ...prise/ubuntu20.04/aerospike.template.conf b/...unity/ubuntu22.04/aerospike.template.conf → ...prise/ubuntu20.04/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/ubuntu22.04/entrypoint.sh → enterprise/ubuntu20.04/entrypoint.sh b/enterprise/ubuntu22.04/entrypoint.sh → enterprise/ubuntu20.04/entrypoint.sh
diff --git a/federal/ubuntu22.04/Dockerfile → federal/ubuntu20.04/Dockerfile b/federal/ubuntu22.04/Dockerfile → federal/ubuntu20.04/Dockerfile
@@ -5,15 +5,15 @@
 # http://github.com/aerospike/aerospike-server.docker
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 
 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/ubuntu:22.04" \
+      org.opencontainers.image.base.name="docker.io/library/ubuntu:20.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.1.0.5" \
+      org.opencontainers.image.version="6.1.0.40" \
       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.1.0.5/aerospike-server-federal_7.1.0.5_tools-11.0.2_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="98db6f7cc3d3bf85485893f2d922d8d481f3750f0d7deb3062746b8a919b8d32"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/6.1.0.40/aerospike-server-federal-6.1.0.40-ubuntu20.04.tgz"
+ARG AEROSPIKE_SHA_X86_64="f75667fa17a90adfd307091fb43ef9019a0d39ebea2129f316a30dc7adb1fd61"
 ARG AEROSPIKE_AARCH64_LINK=""
 ARG AEROSPIKE_SHA_AARCH64=""
 

diff --git a/federal/ubuntu22.04/README.md → federal/ubuntu20.04/README.md b/federal/ubuntu22.04/README.md → federal/ubuntu20.04/README.md
diff --git a/...prise/ubuntu22.04/aerospike.template.conf → federal/ubuntu20.04/aerospike.template.conf b/...prise/ubuntu22.04/aerospike.template.conf → federal/ubuntu20.04/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/ubuntu22.04/entrypoint.sh → federal/ubuntu20.04/entrypoint.sh b/federal/ubuntu22.04/entrypoint.sh → federal/ubuntu20.04/entrypoint.sh