From ac0da549af226cf585ebd413fdc087dba202733b Mon Sep 17 00:00:00 2001 From: mcoberly2 Date: Tue, 2 Apr 2024 22:38:04 +0000 Subject: [PATCH] 7.0.0.7_1 --- bake.hcl | 16 ++++++++-------- community/debian12/Dockerfile | 10 +++++----- community/debian12/aerospike.template.conf | 11 ++++++----- enterprise/debian12/Dockerfile | 10 +++++----- enterprise/debian12/aerospike.template.conf | 11 ++++++----- federal/debian12/Dockerfile | 6 +++--- federal/debian12/aerospike.template.conf | 11 ++++++----- 7 files changed, 39 insertions(+), 36 deletions(-) diff --git a/bake.hcl b/bake.hcl index 239c9a31..5fc77b51 100644 --- a/bake.hcl +++ b/bake.hcl @@ -14,31 +14,31 @@ group "test" { } target "enterprise_debian12_amd64" { - tags=["aerospike/aerospike-server-enterprise-amd64:6.4.0.14", "aerospike/aerospike-server-enterprise-amd64:latest"] + tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.7", "aerospike/aerospike-server-enterprise-amd64:latest"] platforms=["linux/amd64"] context="./enterprise/debian12" } target "enterprise_debian12_arm64" { - tags=["aerospike/aerospike-server-enterprise-arm64:6.4.0.14", "aerospike/aerospike-server-enterprise-arm64:latest"] + tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.7", "aerospike/aerospike-server-enterprise-arm64:latest"] platforms=["linux/arm64"] context="./enterprise/debian12" } target "federal_debian12_amd64" { - tags=["aerospike/aerospike-server-federal-amd64:6.4.0.14", "aerospike/aerospike-server-federal-amd64:latest"] + tags=["aerospike/aerospike-server-federal-amd64:7.0.0.7", "aerospike/aerospike-server-federal-amd64:latest"] platforms=["linux/amd64"] context="./federal/debian12" } target "community_debian12_amd64" { - tags=["aerospike/aerospike-server-community-amd64:6.4.0.14", "aerospike/aerospike-server-community-amd64:latest"] + tags=["aerospike/aerospike-server-community-amd64:7.0.0.7", "aerospike/aerospike-server-community-amd64:latest"] platforms=["linux/amd64"] context="./community/debian12" } target "community_debian12_arm64" { - tags=["aerospike/aerospike-server-community-arm64:6.4.0.14", "aerospike/aerospike-server-community-arm64:latest"] + tags=["aerospike/aerospike-server-community-arm64:7.0.0.7", "aerospike/aerospike-server-community-arm64:latest"] platforms=["linux/arm64"] context="./community/debian12" } @@ -50,19 +50,19 @@ group "push" { } target "enterprise_debian12" { - tags=["aerospike/aerospike-server-enterprise:6.4.0.14", "aerospike/aerospike-server-enterprise:6.4.0.14_1"] + tags=["aerospike/aerospike-server-enterprise:7.0.0.7", "aerospike/aerospike-server-enterprise:7.0.0.7_1", "aerospike/aerospike-server-enterprise:latest"] platforms=["linux/amd64,linux/arm64"] context="./enterprise/debian12" } target "federal_debian12" { - tags=["aerospike/aerospike-server-federal:6.4.0.14", "aerospike/aerospike-server-federal:6.4.0.14_1"] + tags=["aerospike/aerospike-server-federal:7.0.0.7", "aerospike/aerospike-server-federal:7.0.0.7_1", "aerospike/aerospike-server-federal:latest"] platforms=["linux/amd64"] context="./federal/debian12" } target "community_debian12" { - tags=["aerospike/aerospike-server:6.4.0.14", "aerospike/aerospike-server:6.4.0.14_1"] + tags=["aerospike/aerospike-server:7.0.0.7", "aerospike/aerospike-server:7.0.0.7_1", "aerospike/aerospike-server:latest"] platforms=["linux/amd64,linux/arm64"] context="./community/debian12" } diff --git a/community/debian12/Dockerfile b/community/debian12/Dockerfile index 21b40935..334df5ac 100644 --- a/community/debian12/Dockerfile +++ b/community/debian12/Dockerfile @@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Community Server" \ org.opencontainers.image.base.name="docker.io/library/debian:bookworm-slim" \ org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \ org.opencontainers.image.vendor="Aerospike" \ - org.opencontainers.image.version="6.4.0.14" \ + org.opencontainers.image.version="7.0.0.7" \ 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.14/aerospike-server-community_6.4.0.14_tools-10.0.0_debian12_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="b95439e5f2f4beba7d86bb715dc175bad1e3a3b2bb4e2226350474fa05dd7e05" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.14/aerospike-server-community_6.4.0.14_tools-10.0.0_debian12_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="acec77ade04f97889cfff6e693533f5da2704da355116d6e7c9098addf4dd739" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.7/aerospike-server-community_7.0.0.7_tools-10.2.1_debian12_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="0f79a4a5f760183baa83a1523e1db019de496e6babd90108e073534131634ab8" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.7/aerospike-server-community_7.0.0.7_tools-10.2.1_debian12_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="080514cb8a4faea670992968c0c11f44a12430868beb5a789cc6c7d1ba1baa8e" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/community/debian12/aerospike.template.conf b/community/debian12/aerospike.template.conf index 6737692b..7942a049 100644 --- a/community/debian12/aerospike.template.conf +++ b/community/debian12/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/debian12/Dockerfile b/enterprise/debian12/Dockerfile index 7ca33d2f..b4a32e7e 100644 --- a/enterprise/debian12/Dockerfile +++ b/enterprise/debian12/Dockerfile @@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \ org.opencontainers.image.base.name="docker.io/library/debian:bookworm-slim" \ org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \ org.opencontainers.image.vendor="Aerospike" \ - org.opencontainers.image.version="6.4.0.14" \ + org.opencontainers.image.version="7.0.0.7" \ 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.14/aerospike-server-enterprise_6.4.0.14_tools-10.0.0_debian12_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="35865ec65e843064d0bd86152254e524e6fc6c39cf167e09bc54d0361cbc3f4c" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.14/aerospike-server-enterprise_6.4.0.14_tools-10.0.0_debian12_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="8058db3fdaaa3b05117a3bb44d21abb3ae3bb224f6d0028d9401fdd00a8333f4" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.7/aerospike-server-enterprise_7.0.0.7_tools-10.2.1_debian12_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="b42bd0f7d4fe55a6542df24fcc8218956ee44b8775a9d7cb1f575f91539a2c93" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.7/aerospike-server-enterprise_7.0.0.7_tools-10.2.1_debian12_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="e951547c2598665feb532a0a670c0a80157f7ebfde8c961dc08a50d10eb26fce" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/enterprise/debian12/aerospike.template.conf b/enterprise/debian12/aerospike.template.conf index 6737692b..7942a049 100644 --- a/enterprise/debian12/aerospike.template.conf +++ b/enterprise/debian12/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/debian12/Dockerfile b/federal/debian12/Dockerfile index f7dd6064..720d2e65 100644 --- a/federal/debian12/Dockerfile +++ b/federal/debian12/Dockerfile @@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Federal Server" \ org.opencontainers.image.base.name="docker.io/library/debian:bookworm-slim" \ org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \ org.opencontainers.image.vendor="Aerospike" \ - org.opencontainers.image.version="6.4.0.14" \ + org.opencontainers.image.version="7.0.0.7" \ 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.14/aerospike-server-federal_6.4.0.14_tools-10.0.0_debian12_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="03d7815ed119d3a1b07040ce5b36c4b873a8f0d10d1beec8e424bb4059c19cce" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.7/aerospike-server-federal_7.0.0.7_tools-10.2.1_debian12_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="c354ec60520c8efb785533329582929e265bcd1d356f51354b401c4ca4c642e5" ARG AEROSPIKE_AARCH64_LINK="" ARG AEROSPIKE_SHA_AARCH64="" diff --git a/federal/debian12/aerospike.template.conf b/federal/debian12/aerospike.template.conf index 6737692b..7942a049 100644 --- a/federal/debian12/aerospike.template.conf +++ b/federal/debian12/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}") } } -