From ab60bd25e457d6e639df0246a75e47f8e40a5002 Mon Sep 17 00:00:00 2001 From: mcoberly2 Date: Thu, 18 Jul 2024 03:26:23 +0000 Subject: [PATCH] 7.0.0.12_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 086df1be..96b57940 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.20", "aerospike/aerospike-server-enterprise-amd64:latest"] + tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.12", "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.20", "aerospike/aerospike-server-enterprise-arm64:latest"] + tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.12", "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.20", "aerospike/aerospike-server-federal-amd64:latest"] + tags=["aerospike/aerospike-server-federal-amd64:7.0.0.12", "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.20", "aerospike/aerospike-server-community-amd64:latest"] + tags=["aerospike/aerospike-server-community-amd64:7.0.0.12", "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.20", "aerospike/aerospike-server-community-arm64:latest"] + tags=["aerospike/aerospike-server-community-arm64:7.0.0.12", "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.20", "aerospike/aerospike-server-enterprise:6.4.0.20_1"] + tags=["aerospike/aerospike-server-enterprise:7.0.0.12", "aerospike/aerospike-server-enterprise:7.0.0.12_1"] platforms=["linux/amd64,linux/arm64"] context="./enterprise/ubuntu22.04" } target "federal_ubuntu22-04" { - tags=["aerospike/aerospike-server-federal:6.4.0.20", "aerospike/aerospike-server-federal:6.4.0.20_1"] + tags=["aerospike/aerospike-server-federal:7.0.0.12", "aerospike/aerospike-server-federal:7.0.0.12_1"] platforms=["linux/amd64"] context="./federal/ubuntu22.04" } target "community_ubuntu22-04" { - tags=["aerospike/aerospike-server:6.4.0.20", "aerospike/aerospike-server:6.4.0.20_1"] + tags=["aerospike/aerospike-server:7.0.0.12", "aerospike/aerospike-server:7.0.0.12_1"] platforms=["linux/amd64,linux/arm64"] context="./community/ubuntu22.04" } diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu22.04/Dockerfile index a3cd8698..42b2b503 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.20" \ + org.opencontainers.image.version="7.0.0.12" \ 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.20/aerospike-server-community_6.4.0.20_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="d2b535fc57f5686980761d900326d0dacf64e13544f97ff2202270d4d12ecdf4" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.20/aerospike-server-community_6.4.0.20_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="1c90d5609d559625e7262b8ea5e260cf47e4d4eaaf998ec9d7a4b6bb520bdc21" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.12/aerospike-server-community_7.0.0.12_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="1de099705c8c9d448fe0917918a87726d7e1e71aa7187f7ebe9c1c999f8b28d9" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.12/aerospike-server-community_7.0.0.12_tools-10.2.1_ubuntu22.04_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="5df5ccdf67e89e8db98e1310458d547a8842093ad17815998e58bf3e13547882" 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 111f1170..11e78211 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.20" \ + org.opencontainers.image.version="7.0.0.12" \ 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.20/aerospike-server-enterprise_6.4.0.20_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="d789e558f979a3f0aad1df0870bfc5de6f96b9ee4c8fac423b64cc599cd49e03" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.20/aerospike-server-enterprise_6.4.0.20_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="9ba1239313bae5b7883a6e66291703b1d8d14155ef3af39fde1edc2fc0306e80" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.12/aerospike-server-enterprise_7.0.0.12_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="4e6336fad6150d1ada9cb50ae3fbede21f286088e8ac1dc851a6ba87b86717e9" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.12/aerospike-server-enterprise_7.0.0.12_tools-10.2.1_ubuntu22.04_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="fdc882584ec661cb11439aaa66cd940121c385c1f3cb9e578f419f0664ebc530" 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 32fa83fa..dcb66ed8 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.20" \ + org.opencontainers.image.version="7.0.0.12" \ 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.20/aerospike-server-federal_6.4.0.20_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="102bca5d26e5afe5ca5745dca461b19e8a6c27bfb72347b9c053acd800b7dbbe" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.12/aerospike-server-federal_7.0.0.12_tools-10.2.1_ubuntu22.04_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="b1fc63badf6d8cf35fce3cf5e0edc2e93bb04bd4a4fc924a95e54f98934d9cd1" 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}") } } -