From cedca1126766201582e44f48af3d4c57b8fcdc1e Mon Sep 17 00:00:00 2001 From: pvinh-spike Date: Fri, 1 Nov 2024 23:00:04 +0000 Subject: [PATCH] 7.0.0.18_1 --- bake.hcl | 16 ++++++++-------- community/ubuntu22.04/Dockerfile | 10 +++++----- community/ubuntu22.04/aerospike.template.conf | 16 +++++++++------- enterprise/ubuntu22.04/Dockerfile | 10 +++++----- enterprise/ubuntu22.04/aerospike.template.conf | 16 +++++++++------- federal/ubuntu22.04/Dockerfile | 6 +++--- federal/ubuntu22.04/aerospike.template.conf | 16 +++++++++------- 7 files changed, 48 insertions(+), 42 deletions(-) diff --git a/bake.hcl b/bake.hcl index ae2c26ed..092207d5 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.26", "aerospike/aerospike-server-enterprise-amd64:latest"] + tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.18", "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.26", "aerospike/aerospike-server-enterprise-arm64:latest"] + tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.18", "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.26", "aerospike/aerospike-server-federal-amd64:latest"] + tags=["aerospike/aerospike-server-federal-amd64:7.0.0.18", "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.26", "aerospike/aerospike-server-community-amd64:latest"] + tags=["aerospike/aerospike-server-community-amd64:7.0.0.18", "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.26", "aerospike/aerospike-server-community-arm64:latest"] + tags=["aerospike/aerospike-server-community-arm64:7.0.0.18", "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.26", "aerospike/aerospike-server-enterprise:6.4.0.26_1"] + tags=["aerospike/aerospike-server-enterprise:7.0.0.18", "aerospike/aerospike-server-enterprise:7.0.0.18_1"] platforms=["linux/amd64,linux/arm64"] context="./enterprise/ubuntu22.04" } target "federal_ubuntu22-04" { - tags=["aerospike/aerospike-server-federal:6.4.0.26", "aerospike/aerospike-server-federal:6.4.0.26_1"] + tags=["aerospike/aerospike-server-federal:7.0.0.18", "aerospike/aerospike-server-federal:7.0.0.18_1"] platforms=["linux/amd64"] context="./federal/ubuntu22.04" } target "community_ubuntu22-04" { - tags=["aerospike/aerospike-server:6.4.0.26", "aerospike/aerospike-server:6.4.0.26_1"] + tags=["aerospike/aerospike-server:7.0.0.18", "aerospike/aerospike-server:7.0.0.18_1"] platforms=["linux/amd64,linux/arm64"] context="./community/ubuntu22.04" } diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu22.04/Dockerfile index ad114077..209c0dea 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.26" \ + org.opencontainers.image.version="7.0.0.18" \ 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.26/aerospike-server-community_6.4.0.26_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="26b1417553252d5823976965f17fd9a2b242ffaafd508fa5766e45a1b638fc22" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.26/aerospike-server-community_6.4.0.26_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="fdedcd1352b8a7cb081dbd0099c0867f44122baed4b64be94a545a191ed61ba9" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.18/aerospike-server-community_7.0.0.18_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="05a45d3cc92efdf9d3b51fd21526674100cebbfdd0f7f7a4c6cbed9e6de2c06a" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.18/aerospike-server-community_7.0.0.18_tools-10.2.1_ubuntu22.04_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="aab83dea316510e6127b6cc8974d4eae08aa8188d240ea85fb4e2e7747623e30" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/community/ubuntu22.04/aerospike.template.conf b/community/ubuntu22.04/aerospike.template.conf index 6737692b..7959ceed 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 { @@ -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 index adfdd97d..a811df5b 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.26" \ + org.opencontainers.image.version="7.0.0.18" \ 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.26/aerospike-server-enterprise_6.4.0.26_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="5d69b1a14a350b1e4a73d9c79299557cc87a35beeb707891df332577890ed8c5" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.26/aerospike-server-enterprise_6.4.0.26_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="d38519b34a341b0a186ec2b3196037e6c0d79b5346ac7e4c4ab7eb4f64189a8d" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.18/aerospike-server-enterprise_7.0.0.18_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="d1252c199dcf5f6296640f37c51d6db345ac170cef50894739ce015727d86ebe" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.18/aerospike-server-enterprise_7.0.0.18_tools-10.2.1_ubuntu22.04_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="4a796d19402688359ccab597cdce1626892926afdde56f63b9e4de8f71436fd1" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/enterprise/ubuntu22.04/aerospike.template.conf b/enterprise/ubuntu22.04/aerospike.template.conf index 6737692b..7959ceed 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 { @@ -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 index ebf55251..43165091 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.26" \ + org.opencontainers.image.version="7.0.0.18" \ 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.26/aerospike-server-federal_6.4.0.26_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="108d1b0eb1fb5ef059990a7f90852448faa209706847c5faf92f0e846e33bfd9" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.18/aerospike-server-federal_7.0.0.18_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="36409e5388526ef035cbdf1381d0d8b8e7675a56906ea28b9be89ea19d5d7a76" 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..7959ceed 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 { @@ -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}") } } -