From 66f29ee41910317217cd7d7d30a12b86da8286cd Mon Sep 17 00:00:00 2001 From: pvinh-spike <81987648+pvinh-spike@users.noreply.github.com> Date: Mon, 3 Jun 2024 18:34:33 -0700 Subject: [PATCH] 6.1.0.35_1 --- bake.hcl | 56 ++++++++----------- .../{ubuntu22.04 => ubuntu20.04}/Dockerfile | 14 ++--- .../{ubuntu22.04 => ubuntu20.04}/README.md | 0 .../ubuntu20.04}/aerospike.template.conf | 11 ++-- .../entrypoint.sh | 0 .../{ubuntu22.04 => ubuntu20.04}/Dockerfile | 14 ++--- .../{ubuntu22.04 => ubuntu20.04}/README.md | 0 .../ubuntu20.04}/aerospike.template.conf | 11 ++-- .../entrypoint.sh | 0 .../{ubuntu22.04 => ubuntu20.04}/Dockerfile | 10 ++-- .../{ubuntu22.04 => ubuntu20.04}/README.md | 0 .../ubuntu20.04}/aerospike.template.conf | 11 ++-- .../entrypoint.sh | 0 13 files changed, 56 insertions(+), 71 deletions(-) rename community/{ubuntu22.04 => ubuntu20.04}/Dockerfile (93%) rename community/{ubuntu22.04 => ubuntu20.04}/README.md (100%) rename {federal/ubuntu22.04 => community/ubuntu20.04}/aerospike.template.conf (79%) rename community/{ubuntu22.04 => ubuntu20.04}/entrypoint.sh (100%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/Dockerfile (93%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/README.md (100%) rename {community/ubuntu22.04 => enterprise/ubuntu20.04}/aerospike.template.conf (79%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/entrypoint.sh (100%) rename federal/{ubuntu22.04 => ubuntu20.04}/Dockerfile (96%) rename federal/{ubuntu22.04 => ubuntu20.04}/README.md (100%) rename {enterprise/ubuntu22.04 => federal/ubuntu20.04}/aerospike.template.conf (79%) rename federal/{ubuntu22.04 => ubuntu20.04}/entrypoint.sh (100%) diff --git a/bake.hcl b/bake.hcl index 4d3a7545..f0ab6cd7 100644 --- a/bake.hcl +++ b/bake.hcl @@ -10,60 +10,48 @@ #------------------------------------ test ----------------------------------- group "test" { - targets=["enterprise_ubuntu22-04_amd64", "enterprise_ubuntu22-04_arm64", "federal_ubuntu22-04_amd64", "community_ubuntu22-04_amd64", "community_ubuntu22-04_arm64"] + targets=["enterprise_ubuntu20-04_amd64", "federal_ubuntu20-04_amd64", "community_ubuntu20-04_amd64"] } -target "enterprise_ubuntu22-04_amd64" { - tags=["aerospike/aerospike-server-enterprise-amd64:7.1.0.0", "aerospike/aerospike-server-enterprise-amd64:latest"] +target "enterprise_ubuntu20-04_amd64" { + tags=["aerospike/aerospike-server-enterprise-amd64:6.1.0.35", "aerospike/aerospike-server-enterprise-amd64:latest"] platforms=["linux/amd64"] - context="./enterprise/ubuntu22.04" + context="./enterprise/ubuntu20.04" } -target "enterprise_ubuntu22-04_arm64" { - tags=["aerospike/aerospike-server-enterprise-arm64:7.1.0.0", "aerospike/aerospike-server-enterprise-arm64:latest"] - platforms=["linux/arm64"] - context="./enterprise/ubuntu22.04" -} - -target "federal_ubuntu22-04_amd64" { - tags=["aerospike/aerospike-server-federal-amd64:7.1.0.0", "aerospike/aerospike-server-federal-amd64:latest"] +target "federal_ubuntu20-04_amd64" { + tags=["aerospike/aerospike-server-federal-amd64:6.1.0.35", "aerospike/aerospike-server-federal-amd64:latest"] platforms=["linux/amd64"] - context="./federal/ubuntu22.04" + context="./federal/ubuntu20.04" } -target "community_ubuntu22-04_amd64" { - tags=["aerospike/aerospike-server-community-amd64:7.1.0.0", "aerospike/aerospike-server-community-amd64:latest"] +target "community_ubuntu20-04_amd64" { + tags=["aerospike/aerospike-server-community-amd64:6.1.0.35", "aerospike/aerospike-server-community-amd64:latest"] platforms=["linux/amd64"] - context="./community/ubuntu22.04" -} - -target "community_ubuntu22-04_arm64" { - tags=["aerospike/aerospike-server-community-arm64:7.1.0.0", "aerospike/aerospike-server-community-arm64:latest"] - platforms=["linux/arm64"] - context="./community/ubuntu22.04" + context="./community/ubuntu20.04" } #------------------------------------ push ----------------------------------- group "push" { - targets=["enterprise_ubuntu22-04", "federal_ubuntu22-04", "community_ubuntu22-04"] + targets=["enterprise_ubuntu20-04", "federal_ubuntu20-04", "community_ubuntu20-04"] } -target "enterprise_ubuntu22-04" { - tags=["aerospike/aerospike-server-enterprise:7.1.0.0", "aerospike/aerospike-server-enterprise:7.1.0.0_2", "aerospike/aerospike-server-enterprise:latest"] - platforms=["linux/amd64,linux/arm64"] - context="./enterprise/ubuntu22.04" +target "enterprise_ubuntu20-04" { + tags=["aerospike/aerospike-server-enterprise:6.1.0.35", "aerospike/aerospike-server-enterprise:6.1.0.35_1"] + platforms=["linux/amd64"] + context="./enterprise/ubuntu20.04" } -target "federal_ubuntu22-04" { - tags=["aerospike/aerospike-server-federal:7.1.0.0", "aerospike/aerospike-server-federal:7.1.0.0_2", "aerospike/aerospike-server-federal:latest"] +target "federal_ubuntu20-04" { + tags=["aerospike/aerospike-server-federal:6.1.0.35", "aerospike/aerospike-server-federal:6.1.0.35_1"] platforms=["linux/amd64"] - context="./federal/ubuntu22.04" + context="./federal/ubuntu20.04" } -target "community_ubuntu22-04" { - tags=["aerospike/aerospike-server:7.1.0.0", "aerospike/aerospike-server:7.1.0.0_2", "aerospike/aerospike-server:latest"] - platforms=["linux/amd64,linux/arm64"] - context="./community/ubuntu22.04" +target "community_ubuntu20-04" { + tags=["aerospike/aerospike-server:6.1.0.35", "aerospike/aerospike-server:6.1.0.35_1"] + platforms=["linux/amd64"] + context="./community/ubuntu20.04" } diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu20.04/Dockerfile similarity index 93% rename from community/ubuntu22.04/Dockerfile rename to community/ubuntu20.04/Dockerfile index 92603e55..a0dc9e53 100644 --- a/community/ubuntu22.04/Dockerfile +++ b/community/ubuntu20.04/Dockerfile @@ -5,15 +5,15 @@ # http://github.com/aerospike/aerospike-server.docker # -FROM ubuntu:22.04 +FROM ubuntu:20.04 LABEL org.opencontainers.image.title="Aerospike Community Server" \ org.opencontainers.image.description="Aerospike is a real-time database with predictable performance at petabyte scale with microsecond latency over billions of transactions." \ org.opencontainers.image.documentation="https://hub.docker.com/_/aerospike" \ - org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \ + org.opencontainers.image.base.name="docker.io/library/ubuntu:20.04" \ org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \ org.opencontainers.image.vendor="Aerospike" \ - org.opencontainers.image.version="7.1.0.0" \ + org.opencontainers.image.version="6.1.0.35" \ 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/7.1.0.0/aerospike-server-community_7.1.0.0_tools-11.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="ab61ba2430ef89ef70ba3cb4e858cdc23c507428a2d244856c07f734141ee0eb" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.1.0.0/aerospike-server-community_7.1.0.0_tools-11.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="ef6ea09e51ccbe6db01fc19dcae847ffbd7e2690972e64dd671c63f54b905b7b" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.1.0.35/aerospike-server-community-6.1.0.35-ubuntu20.04.tgz" +ARG AEROSPIKE_SHA_X86_64="3532264e4e2167a312f5c09125ef627f197d29e81c70ac1a2d566f8dd44c0c86" +ARG AEROSPIKE_AARCH64_LINK="" +ARG AEROSPIKE_SHA_AARCH64="" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/community/ubuntu22.04/README.md b/community/ubuntu20.04/README.md similarity index 100% rename from community/ubuntu22.04/README.md rename to community/ubuntu20.04/README.md diff --git a/federal/ubuntu22.04/aerospike.template.conf b/community/ubuntu20.04/aerospike.template.conf similarity index 79% rename from federal/ubuntu22.04/aerospike.template.conf rename to community/ubuntu20.04/aerospike.template.conf index 7942a049..6737692b 100644 --- a/federal/ubuntu22.04/aerospike.template.conf +++ b/community/ubuntu20.04/aerospike.template.conf @@ -8,7 +8,6 @@ # This stanza must come first. service { $([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}") - cluster-name docker } logging { @@ -55,14 +54,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 $([ "${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. + storage-engine device { + data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem file /opt/aerospike/data/${NAMESPACE}.dat filesize ${STORAGE_GB}G - $(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}") + read-page-cache ${READ_PAGE_CACHE} } } + diff --git a/community/ubuntu22.04/entrypoint.sh b/community/ubuntu20.04/entrypoint.sh similarity index 100% rename from community/ubuntu22.04/entrypoint.sh rename to community/ubuntu20.04/entrypoint.sh diff --git a/enterprise/ubuntu22.04/Dockerfile b/enterprise/ubuntu20.04/Dockerfile similarity index 93% rename from enterprise/ubuntu22.04/Dockerfile rename to enterprise/ubuntu20.04/Dockerfile index 854eb418..eed0aaa5 100644 --- a/enterprise/ubuntu22.04/Dockerfile +++ b/enterprise/ubuntu20.04/Dockerfile @@ -5,15 +5,15 @@ # http://github.com/aerospike/aerospike-server.docker # -FROM ubuntu:22.04 +FROM ubuntu:20.04 LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \ org.opencontainers.image.description="Aerospike is a real-time database with predictable performance at petabyte scale with microsecond latency over billions of transactions." \ org.opencontainers.image.documentation="https://hub.docker.com/_/aerospike" \ - org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \ + org.opencontainers.image.base.name="docker.io/library/ubuntu:20.04" \ org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \ org.opencontainers.image.vendor="Aerospike" \ - org.opencontainers.image.version="7.1.0.0" \ + org.opencontainers.image.version="6.1.0.35" \ 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/7.1.0.0/aerospike-server-enterprise_7.1.0.0_tools-11.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="6046f85cd37ebbbca8f3ad7a2079954a223de5a433ddb34104a8362846bdd002" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.1.0.0/aerospike-server-enterprise_7.1.0.0_tools-11.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="20f50036269a1b59b611dae35952f80f77fdd549355590011af9fa51c7c1a94f" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.1.0.35/aerospike-server-enterprise-6.1.0.35-ubuntu20.04.tgz" +ARG AEROSPIKE_SHA_X86_64="4b3fca2089643819291a1d531390c9c9e74091af06630d486a500b925d4e00f4" +ARG AEROSPIKE_AARCH64_LINK="" +ARG AEROSPIKE_SHA_AARCH64="" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] diff --git a/enterprise/ubuntu22.04/README.md b/enterprise/ubuntu20.04/README.md similarity index 100% rename from enterprise/ubuntu22.04/README.md rename to enterprise/ubuntu20.04/README.md diff --git a/community/ubuntu22.04/aerospike.template.conf b/enterprise/ubuntu20.04/aerospike.template.conf similarity index 79% rename from community/ubuntu22.04/aerospike.template.conf rename to enterprise/ubuntu20.04/aerospike.template.conf index 7942a049..6737692b 100644 --- a/community/ubuntu22.04/aerospike.template.conf +++ b/enterprise/ubuntu20.04/aerospike.template.conf @@ -8,7 +8,6 @@ # This stanza must come first. service { $([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}") - cluster-name docker } logging { @@ -55,14 +54,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 $([ "${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. + storage-engine device { + data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem file /opt/aerospike/data/${NAMESPACE}.dat filesize ${STORAGE_GB}G - $(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}") + read-page-cache ${READ_PAGE_CACHE} } } + diff --git a/enterprise/ubuntu22.04/entrypoint.sh b/enterprise/ubuntu20.04/entrypoint.sh similarity index 100% rename from enterprise/ubuntu22.04/entrypoint.sh rename to enterprise/ubuntu20.04/entrypoint.sh diff --git a/federal/ubuntu22.04/Dockerfile b/federal/ubuntu20.04/Dockerfile similarity index 96% rename from federal/ubuntu22.04/Dockerfile rename to federal/ubuntu20.04/Dockerfile index 39c75f11..21b504b2 100644 --- a/federal/ubuntu22.04/Dockerfile +++ b/federal/ubuntu20.04/Dockerfile @@ -5,15 +5,15 @@ # http://github.com/aerospike/aerospike-server.docker # -FROM ubuntu:22.04 +FROM ubuntu:20.04 LABEL org.opencontainers.image.title="Aerospike Federal Server" \ org.opencontainers.image.description="Aerospike is a real-time database with predictable performance at petabyte scale with microsecond latency over billions of transactions." \ org.opencontainers.image.documentation="https://hub.docker.com/_/aerospike" \ - org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \ + org.opencontainers.image.base.name="docker.io/library/ubuntu:20.04" \ org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \ org.opencontainers.image.vendor="Aerospike" \ - org.opencontainers.image.version="7.1.0.0" \ + org.opencontainers.image.version="6.1.0.35" \ 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/7.1.0.0/aerospike-server-federal_7.1.0.0_tools-11.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="1a8446e5659aba4c1f8fd3ec47c770e916d16e554fe6b2bb036f53b650930916" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/6.1.0.35/aerospike-server-federal-6.1.0.35-ubuntu20.04.tgz" +ARG AEROSPIKE_SHA_X86_64="52fc617a13441f341581c9732a188c2aee1a0d575300ca5e89345b89898f6467" ARG AEROSPIKE_AARCH64_LINK="" ARG AEROSPIKE_SHA_AARCH64="" diff --git a/federal/ubuntu22.04/README.md b/federal/ubuntu20.04/README.md similarity index 100% rename from federal/ubuntu22.04/README.md rename to federal/ubuntu20.04/README.md diff --git a/enterprise/ubuntu22.04/aerospike.template.conf b/federal/ubuntu20.04/aerospike.template.conf similarity index 79% rename from enterprise/ubuntu22.04/aerospike.template.conf rename to federal/ubuntu20.04/aerospike.template.conf index 7942a049..6737692b 100644 --- a/enterprise/ubuntu22.04/aerospike.template.conf +++ b/federal/ubuntu20.04/aerospike.template.conf @@ -8,7 +8,6 @@ # This stanza must come first. service { $([ -n "${FEATURE_KEY_FILE}" ] && echo "feature-key-file ${FEATURE_KEY_FILE}") - cluster-name docker } logging { @@ -55,14 +54,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 $([ "${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. + storage-engine device { + data-in-memory ${DATA_IN_MEMORY} # if true, in-memory, persisted to the filesystem file /opt/aerospike/data/${NAMESPACE}.dat filesize ${STORAGE_GB}G - $(([ -z "${DATA_IN_MEMORY}" ] || [ "${DATA_IN_MEMORY}" = "false" ]) && echo "read-page-cache ${READ_PAGE_CACHE}") + read-page-cache ${READ_PAGE_CACHE} } } + diff --git a/federal/ubuntu22.04/entrypoint.sh b/federal/ubuntu20.04/entrypoint.sh similarity index 100% rename from federal/ubuntu22.04/entrypoint.sh rename to federal/ubuntu20.04/entrypoint.sh