From 08d735891800adec2f22d6c0e19e2f8fd03daa17 Mon Sep 17 00:00:00 2001 From: pvinh-spike Date: Thu, 3 Oct 2024 05:29:48 +0000 Subject: [PATCH] 7.0.0.16_1 --- bake.hcl | 16 ++++++++-------- community/ubuntu22.04/Dockerfile | 10 +++++----- community/ubuntu22.04/aerospike.template.conf | 11 ++++++----- enterprise/ubuntu22.04/Dockerfile | 10 +++++----- enterprise/ubuntu22.04/aerospike.template.conf | 11 ++++++----- federal/ubuntu22.04/Dockerfile | 6 +++--- federal/ubuntu22.04/aerospike.template.conf | 11 ++++++----- 7 files changed, 39 insertions(+), 36 deletions(-) diff --git a/bake.hcl b/bake.hcl index 73fa9df3..ec2602b5 100644 --- 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.25", "aerospike/aerospike-server-enterprise-amd64:latest"] + tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.16", "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.25", "aerospike/aerospike-server-enterprise-arm64:latest"] + tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.16", "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.25", "aerospike/aerospike-server-federal-amd64:latest"] + tags=["aerospike/aerospike-server-federal-amd64:7.0.0.16", "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.25", "aerospike/aerospike-server-community-amd64:latest"] + tags=["aerospike/aerospike-server-community-amd64:7.0.0.16", "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.25", "aerospike/aerospike-server-community-arm64:latest"] + tags=["aerospike/aerospike-server-community-arm64:7.0.0.16", "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.25", "aerospike/aerospike-server-enterprise:6.4.0.25_1"] + tags=["aerospike/aerospike-server-enterprise:7.0.0.16", "aerospike/aerospike-server-enterprise:7.0.0.16_1"] platforms=["linux/amd64,linux/arm64"] context="./enterprise/ubuntu22.04" } target "federal_ubuntu22-04" { - tags=["aerospike/aerospike-server-federal:6.4.0.25", "aerospike/aerospike-server-federal:6.4.0.25_1"] + tags=["aerospike/aerospike-server-federal:7.0.0.16", "aerospike/aerospike-server-federal:7.0.0.16_1"] platforms=["linux/amd64"] context="./federal/ubuntu22.04" } target "community_ubuntu22-04" { - tags=["aerospike/aerospike-server:6.4.0.25", "aerospike/aerospike-server:6.4.0.25_1"] + tags=["aerospike/aerospike-server:7.0.0.16", "aerospike/aerospike-server:7.0.0.16_1"] platforms=["linux/amd64,linux/arm64"] context="./community/ubuntu22.04" } diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu22.04/Dockerfile index ab98fec8..73e16886 100644 --- 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.25" \ + org.opencontainers.image.version="7.0.0.16" \ 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.25/aerospike-server-community_6.4.0.25_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="712bc2a28e614ba81f580fd3546b6473af8840dcf61ab24d537397d6b96def66" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.25/aerospike-server-community_6.4.0.25_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="a547b591a7963758bbbefb48c49af4e2efbd6e91dc67e1e1d841c2be594ad789" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.16/aerospike-server-community_7.0.0.16_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="f66dec26aea39811d9b966e4b9c046c77bcc4df1efc710eacbb41ba152613044" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.16/aerospike-server-community_7.0.0.16_tools-10.2.1_ubuntu22.04_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="78c13597e58c975ecf7fe95e517bdaeaa9be192d846f7f36ef41d5926b2a63cc" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/community/ubuntu22.04/aerospike.template.conf b/community/ubuntu22.04/aerospike.template.conf index 6737692b..7942a049 100644 --- 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 { @@ -54,14 +55,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 device { - data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem + 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 index 84436539..07e41c88 100644 --- 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.25" \ + org.opencontainers.image.version="7.0.0.16" \ 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.25/aerospike-server-enterprise_6.4.0.25_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="df78599a982ab17ede31b67d589cace8eecf3f27f478a890e5439797c20bd471" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.25/aerospike-server-enterprise_6.4.0.25_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="53f39c20c3f767ae4278320addbb02adbcbdf661877908802bc2a47132011a52" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.16/aerospike-server-enterprise_7.0.0.16_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="b168131d877feb608f4c76b994754a52e502fde5a24bd1059234d79c3aed0d28" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.16/aerospike-server-enterprise_7.0.0.16_tools-10.2.1_ubuntu22.04_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="581efda905a647d6019a199c379e06f820c02d5350f828e3a2a765f75cf9f37d" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/enterprise/ubuntu22.04/aerospike.template.conf b/enterprise/ubuntu22.04/aerospike.template.conf index 6737692b..7942a049 100644 --- 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 { @@ -54,14 +55,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 device { - data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem + 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 index c6f48aa8..82e7cf4b 100644 --- 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.25" \ + org.opencontainers.image.version="7.0.0.16" \ 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.25/aerospike-server-federal_6.4.0.25_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="e4d3a5e2d76b429f3bce05b446dd05559158f46b7a1f5ae2f4a0d051e2d62a98" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.16/aerospike-server-federal_7.0.0.16_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="e67316802fcae7e94fce048ec746a0b0ad04b20cf4b3d2ca6f9073ad38714230" ARG AEROSPIKE_AARCH64_LINK="" ARG AEROSPIKE_SHA_AARCH64="" diff --git a/federal/ubuntu22.04/aerospike.template.conf b/federal/ubuntu22.04/aerospike.template.conf index 6737692b..7942a049 100644 --- 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 { @@ -54,14 +55,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 device { - data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem + 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}") } } -