diff --git a/bake.hcl b/bake.hcl index ae55bf5..e6e6496 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.15", "aerospike/aerospike-server-enterprise-amd64:latest"] + tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.8", "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.15", "aerospike/aerospike-server-enterprise-arm64:latest"] + tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.8", "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.15", "aerospike/aerospike-server-federal-amd64:latest"] + tags=["aerospike/aerospike-server-federal-amd64:7.0.0.8", "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.15", "aerospike/aerospike-server-community-amd64:latest"] + tags=["aerospike/aerospike-server-community-amd64:7.0.0.8", "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.15", "aerospike/aerospike-server-community-arm64:latest"] + tags=["aerospike/aerospike-server-community-arm64:7.0.0.8", "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.15", "aerospike/aerospike-server-enterprise:6.4.0.15_1"] + tags=["aerospike/aerospike-server-enterprise:7.0.0.8", "aerospike/aerospike-server-enterprise:7.0.0.8_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.15", "aerospike/aerospike-server-federal:6.4.0.15_1"] + tags=["aerospike/aerospike-server-federal:7.0.0.8", "aerospike/aerospike-server-federal:7.0.0.8_1", "aerospike/aerospike-server-federal:latest"] platforms=["linux/amd64"] context="./federal/debian12" } target "community_debian12" { - tags=["aerospike/aerospike-server:6.4.0.15", "aerospike/aerospike-server:6.4.0.15_1"] + tags=["aerospike/aerospike-server:7.0.0.8", "aerospike/aerospike-server:7.0.0.8_1", "aerospike/aerospike-server:latest"] platforms=["linux/amd64,linux/arm64"] context="./community/debian12" } diff --git a/community/debian12/Dockerfile b/community/debian12/Dockerfile index e91810a..7ffbb9b 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.15" \ + org.opencontainers.image.version="7.0.0.8" \ 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.15/aerospike-server-community_6.4.0.15_tools-10.0.0_debian12_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="87dd7fefe5b6021cd7cfd5cd374da25298d0d1850057b2d91892165858172821" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.15/aerospike-server-community_6.4.0.15_tools-10.0.0_debian12_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="b1e7a0a9b2eca0ca2b11f19f88c871d3ab0b0f3d5384e4472bfe433b4c7d4848" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.8/aerospike-server-community_7.0.0.8_tools-10.2.1_debian12_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="54eba8c7c413015b2f9d4571599238e0634ec8b66adf8e65cb9db6be1bdf1980" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.8/aerospike-server-community_7.0.0.8_tools-10.2.1_debian12_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="f4a8106ff23da8f07f1bd7b69b1aea1312fbb73a4dd3f1d8cc70db93b6e63e8e" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/community/debian12/aerospike.template.conf b/community/debian12/aerospike.template.conf index 6737692..7942a04 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 bd98e02..4852d63 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.15" \ + org.opencontainers.image.version="7.0.0.8" \ 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.15/aerospike-server-enterprise_6.4.0.15_tools-10.0.0_debian12_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="1949a805922017ff2f378055a74ed08464d583a7b01c65d13b5e6274a93c6b0b" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.15/aerospike-server-enterprise_6.4.0.15_tools-10.0.0_debian12_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="732463174c5ab9ddc12b0ea7561a0e3b9b5bc767ee3ac00b1b1cc7280330ccd7" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.8/aerospike-server-enterprise_7.0.0.8_tools-10.2.1_debian12_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="a092f046debcf70d33c5dc6ed99a89d030a1077b5462119530f531914f63ee6b" +ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.8/aerospike-server-enterprise_7.0.0.8_tools-10.2.1_debian12_aarch64.tgz" +ARG AEROSPIKE_SHA_AARCH64="686b85375e53e3b6aa1f35d89ecf22ad6677a7b2cc235c8f36b401ab0abf32f3" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/enterprise/debian12/aerospike.template.conf b/enterprise/debian12/aerospike.template.conf index 6737692..7942a04 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 8e5ad38..1d916b1 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.15" \ + org.opencontainers.image.version="7.0.0.8" \ 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.15/aerospike-server-federal_6.4.0.15_tools-10.0.0_debian12_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="fb29bd0445493095a92538a6bf50baa954f8da9894d79327dbb5ce72a3037596" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.8/aerospike-server-federal_7.0.0.8_tools-10.2.1_debian12_x86_64.tgz" +ARG AEROSPIKE_SHA_X86_64="8db0f055c3758976e2795a6f80c9ce9edf4b4e1a1d7411ef54dfa21ad15ad2ed" ARG AEROSPIKE_AARCH64_LINK="" ARG AEROSPIKE_SHA_AARCH64="" diff --git a/federal/debian12/aerospike.template.conf b/federal/debian12/aerospike.template.conf index 6737692..7942a04 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}") } } -