From d9280a31354ccf769c80a651a95c0d6066c956de Mon Sep 17 00:00:00 2001 From: pvinh-spike Date: Thu, 3 Oct 2024 04:59:31 +0000 Subject: [PATCH] 6.1.0.42_1 --- bake.hcl | 56 ++++++++----------- .../{ubuntu22.04 => ubuntu20.04}/Dockerfile | 16 +++--- .../{ubuntu22.04 => ubuntu20.04}/README.md | 0 .../aerospike.template.conf | 0 .../entrypoint.sh | 0 .../{ubuntu22.04 => ubuntu20.04}/Dockerfile | 16 +++--- .../{ubuntu22.04 => ubuntu20.04}/README.md | 0 .../aerospike.template.conf | 0 .../entrypoint.sh | 0 .../{ubuntu22.04 => ubuntu20.04}/Dockerfile | 12 ++-- .../{ubuntu22.04 => ubuntu20.04}/README.md | 0 .../aerospike.template.conf | 0 .../entrypoint.sh | 0 13 files changed, 44 insertions(+), 56 deletions(-) rename community/{ubuntu22.04 => ubuntu20.04}/Dockerfile (91%) rename community/{ubuntu22.04 => ubuntu20.04}/README.md (100%) rename community/{ubuntu22.04 => ubuntu20.04}/aerospike.template.conf (100%) rename community/{ubuntu22.04 => ubuntu20.04}/entrypoint.sh (100%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/Dockerfile (91%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/README.md (100%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/aerospike.template.conf (100%) rename enterprise/{ubuntu22.04 => ubuntu20.04}/entrypoint.sh (100%) rename federal/{ubuntu22.04 => ubuntu20.04}/Dockerfile (95%) rename federal/{ubuntu22.04 => ubuntu20.04}/README.md (100%) rename federal/{ubuntu22.04 => ubuntu20.04}/aerospike.template.conf (100%) rename federal/{ubuntu22.04 => ubuntu20.04}/entrypoint.sh (100%) diff --git a/bake.hcl b/bake.hcl index 5799aa4b..5266aac4 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:6.4.0.23", "aerospike/aerospike-server-enterprise-amd64:latest"] +target "enterprise_ubuntu20-04_amd64" { + tags=["aerospike/aerospike-server-enterprise-amd64:6.1.0.42", "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:6.4.0.23", "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.23", "aerospike/aerospike-server-federal-amd64:latest"] +target "federal_ubuntu20-04_amd64" { + tags=["aerospike/aerospike-server-federal-amd64:6.1.0.42", "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:6.4.0.23", "aerospike/aerospike-server-community-amd64:latest"] +target "community_ubuntu20-04_amd64" { + tags=["aerospike/aerospike-server-community-amd64:6.1.0.42", "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.23", "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:6.4.0.23", "aerospike/aerospike-server-enterprise:6.4.0.23_2"] - platforms=["linux/amd64,linux/arm64"] - context="./enterprise/ubuntu22.04" +target "enterprise_ubuntu20-04" { + tags=["aerospike/aerospike-server-enterprise:6.1.0.42", "aerospike/aerospike-server-enterprise:6.1.0.42_1"] + platforms=["linux/amd64"] + context="./enterprise/ubuntu20.04" } -target "federal_ubuntu22-04" { - tags=["aerospike/aerospike-server-federal:6.4.0.23", "aerospike/aerospike-server-federal:6.4.0.23_2"] +target "federal_ubuntu20-04" { + tags=["aerospike/aerospike-server-federal:6.1.0.42", "aerospike/aerospike-server-federal:6.1.0.42_1"] platforms=["linux/amd64"] - context="./federal/ubuntu22.04" + context="./federal/ubuntu20.04" } -target "community_ubuntu22-04" { - tags=["aerospike/aerospike-server:6.4.0.23", "aerospike/aerospike-server:6.4.0.23_2"] - platforms=["linux/amd64,linux/arm64"] - context="./community/ubuntu22.04" +target "community_ubuntu20-04" { + tags=["aerospike/aerospike-server:6.1.0.42", "aerospike/aerospike-server:6.1.0.42_1"] + platforms=["linux/amd64"] + context="./community/ubuntu20.04" } diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu20.04/Dockerfile similarity index 91% rename from community/ubuntu22.04/Dockerfile rename to community/ubuntu20.04/Dockerfile index 2b76874a..363ec43c 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="6.4.0.23" \ + org.opencontainers.image.version="6.1.0.42" \ 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.23/aerospike-server-community_6.4.0.23_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="1d38b1893235c24c4538a14e91711638bc1384a5c7bad9c455a41038dae05f8f" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.4.0.23/aerospike-server-community_6.4.0.23_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="20a793a3fc5b001567e2da3b427fcd42f9802e2899c3f43a5e4ed4915244e7fa" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.1.0.42/aerospike-server-community-6.1.0.42-ubuntu20.04.tgz" +ARG AEROSPIKE_SHA_X86_64="4d8059e789d4e8730463b0b1de759b20401d60574a16a25197051550516e2ddf" +ARG AEROSPIKE_AARCH64_LINK="" +ARG AEROSPIKE_SHA_AARCH64="" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] @@ -49,7 +49,7 @@ RUN \ }; \ { \ # 10-download.part - Vars used for tini and tools. - VERSION="$(grep -oE "/[0-9]+[.][0-9]+[.][0-9]+([.][0-9]+)+(-rc[0-9]+)?([-][0-9]+[-]g[0-9a-z]*)?/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/' | tail -1)"; \ + VERSION="$(grep -oE "/[0-9]+[.][0-9]+[.][0-9]+([.][0-9]+)+(-[a-z0-9]+)?([-][0-9]+[-]g[0-9a-z]*)?/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/' | tail -1)"; \ }; \ { \ # 10-common.part - Install tini. 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/community/ubuntu22.04/aerospike.template.conf b/community/ubuntu20.04/aerospike.template.conf similarity index 100% rename from community/ubuntu22.04/aerospike.template.conf rename to community/ubuntu20.04/aerospike.template.conf 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 91% rename from enterprise/ubuntu22.04/Dockerfile rename to enterprise/ubuntu20.04/Dockerfile index 7980feb0..1bc52cae 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="6.4.0.23" \ + org.opencontainers.image.version="6.1.0.42" \ 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.23/aerospike-server-enterprise_6.4.0.23_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="436459d5fc54afc9d6c0fbe9c5ff4f671b210391e60d39d163d8a7e684b7c07f" -ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.4.0.23/aerospike-server-enterprise_6.4.0.23_tools-10.0.0_ubuntu22.04_aarch64.tgz" -ARG AEROSPIKE_SHA_AARCH64="5dab8322c95da35f72f075ba403ab1073adbe3a5ba541fa21cb6efea24f6bf7b" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.1.0.42/aerospike-server-enterprise-6.1.0.42-ubuntu20.04.tgz" +ARG AEROSPIKE_SHA_X86_64="5d098af89074b2abc3d6515838344412a90a268423952cb54482d282e69a5bff" +ARG AEROSPIKE_AARCH64_LINK="" +ARG AEROSPIKE_SHA_AARCH64="" SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"] @@ -49,7 +49,7 @@ RUN \ }; \ { \ # 10-download.part - Vars used for tini and tools. - VERSION="$(grep -oE "/[0-9]+[.][0-9]+[.][0-9]+([.][0-9]+)+(-rc[0-9]+)?([-][0-9]+[-]g[0-9a-z]*)?/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/' | tail -1)"; \ + VERSION="$(grep -oE "/[0-9]+[.][0-9]+[.][0-9]+([.][0-9]+)+(-[a-z0-9]+)?([-][0-9]+[-]g[0-9a-z]*)?/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/' | tail -1)"; \ }; \ { \ # 10-common.part - Install tini. 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/enterprise/ubuntu22.04/aerospike.template.conf b/enterprise/ubuntu20.04/aerospike.template.conf similarity index 100% rename from enterprise/ubuntu22.04/aerospike.template.conf rename to enterprise/ubuntu20.04/aerospike.template.conf 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 95% rename from federal/ubuntu22.04/Dockerfile rename to federal/ubuntu20.04/Dockerfile index 944bdf44..5cc9ecb9 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="6.4.0.23" \ + org.opencontainers.image.version="6.1.0.42" \ 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.23/aerospike-server-federal_6.4.0.23_tools-10.0.0_ubuntu22.04_x86_64.tgz" -ARG AEROSPIKE_SHA_X86_64="3b3ab64496a43ffea8a97e7954adfef0e0607a5bfbb4c3537f701e7abaf21f63" +ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/6.1.0.42/aerospike-server-federal-6.1.0.42-ubuntu20.04.tgz" +ARG AEROSPIKE_SHA_X86_64="41e60dd3c9bd28f4d5f0f87a702e76ed89b80dc509882355b0fa271e882913d2" ARG AEROSPIKE_AARCH64_LINK="" ARG AEROSPIKE_SHA_AARCH64="" @@ -49,7 +49,7 @@ RUN \ }; \ { \ # 10-download.part - Vars used for tini and tools. - VERSION="$(grep -oE "/[0-9]+[.][0-9]+[.][0-9]+([.][0-9]+)+(-rc[0-9]+)?([-][0-9]+[-]g[0-9a-z]*)?/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/' | tail -1)"; \ + VERSION="$(grep -oE "/[0-9]+[.][0-9]+[.][0-9]+([.][0-9]+)+(-[a-z0-9]+)?([-][0-9]+[-]g[0-9a-z]*)?/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/' | tail -1)"; \ }; \ { \ # 10-common.part - Install tini. 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/federal/ubuntu22.04/aerospike.template.conf b/federal/ubuntu20.04/aerospike.template.conf similarity index 100% rename from federal/ubuntu22.04/aerospike.template.conf rename to federal/ubuntu20.04/aerospike.template.conf 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