Skip to content

Aerospike 7.1.0.0#16775

Merged
yosifkit merged 1 commit intodocker-library:masterfrom
pvinh-spike:patch-26
May 16, 2024
Merged

Aerospike 7.1.0.0#16775
yosifkit merged 1 commit intodocker-library:masterfrom
pvinh-spike:patch-26

Conversation

@pvinh-spike
Copy link
Contributor

@pvinh-spike pvinh-spike requested a review from a team as a code owner May 15, 2024 10:33
@github-actions
Copy link

Diff for a8db5ec:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1c7adb7..b80861c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,13 +1,13 @@
 Maintainers: Lucien Volmar <lucien@aerospike.com> (@volmarl), Michael Coberly <mcoberly@aerospike.com> (@mcoberly2), Phuc Vinh <pvinh@aerospike.com> (@pvinh-spike), Kevin Porter <kporter@aerospike.com> (@kportertx)
 
-Tags: ce-7.0.0.9, ce-7.0.0.9_1
+Tags: ce-7.1.0.0, ce-7.1.0.0_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: 0e3d45027a31f3753283d1f92f94c86739f5103a
-Directory: community/debian12
+GitCommit: af847cba3ce8e7d4f8207106d6bf5ae59e749473
+Directory: community/ubuntu22.04
 
-Tags: ee-7.0.0.9, ee-7.0.0.9_1
+Tags: ee-7.1.0.0, ee-7.1.0.0_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: 0e3d45027a31f3753283d1f92f94c86739f5103a
-Directory: enterprise/debian12
+GitCommit: af847cba3ce8e7d4f8207106d6bf5ae59e749473
+Directory: enterprise/ubuntu22.04
diff --git a/_bashbrew-list b/_bashbrew-list
index 20c5904..d178f0f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
-aerospike:ce-7.0.0.9
-aerospike:ce-7.0.0.9_1
-aerospike:ee-7.0.0.9
-aerospike:ee-7.0.0.9_1
+aerospike:ce-7.1.0.0
+aerospike:ce-7.1.0.0_1
+aerospike:ee-7.1.0.0
+aerospike:ee-7.1.0.0_1
diff --git a/aerospike_ce-7.0.0.9_1/Dockerfile b/aerospike_ce-7.1.0.0_1/Dockerfile
similarity index 91%
rename from aerospike_ce-7.0.0.9_1/Dockerfile
rename to aerospike_ce-7.1.0.0_1/Dockerfile
index c511ddf..4add94a 100644
--- a/aerospike_ce-7.0.0.9_1/Dockerfile
+++ b/aerospike_ce-7.1.0.0_1/Dockerfile
@@ -5,15 +5,15 @@
 # https://github.com/aerospike/aerospike-server.docker
 #
 
-FROM debian:bookworm-slim
+FROM ubuntu:22.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/debian:bookworm-slim" \
+      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="7.0.0.9" \
+      org.opencontainers.image.version="7.1.0.0" \
       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.0.0.9/aerospike-server-community_7.0.0.9_tools-10.2.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="0c4002c6ffa51b9270fd9e6929e05d597f07997cd5e32396ca9e45d4d06c780f"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.9/aerospike-server-community_7.0.0.9_tools-10.2.1_debian12_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="854f01a9ed95971ffdc469c7e2c494ce239d96deee5f8a987ed94e0157d9a9ac"
+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="11d29cf9a1ceff7bfa6123aafabdf9e571fa0a198cab2f3fda2591a3dcab0e36"
+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="e74b09c59039e781c6cd387ba37ca10649f482db71ffe1b071e2faf9acded1f0"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 
@@ -124,10 +124,7 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-deb.part - Extract tools.
-    # ar on debian10 doesn't support '--output'
-    pushd aerospike/pkg || exit 1; \
-    ar -x ../aerospike-tools*.deb; \
-    popd || exit 1; \
+    ar -x aerospike/aerospike-tools*.deb --output aerospike/pkg; \
     tar xf aerospike/pkg/data.tar.xz -C aerospike/pkg/; \
   }; \
   { \
diff --git a/aerospike_ce-7.0.0.9_1/aerospike.template.conf b/aerospike_ce-7.1.0.0_1/aerospike.template.conf
similarity index 100%
rename from aerospike_ce-7.0.0.9_1/aerospike.template.conf
rename to aerospike_ce-7.1.0.0_1/aerospike.template.conf
diff --git a/aerospike_ce-7.0.0.9_1/entrypoint.sh b/aerospike_ce-7.1.0.0_1/entrypoint.sh
similarity index 100%
rename from aerospike_ce-7.0.0.9_1/entrypoint.sh
rename to aerospike_ce-7.1.0.0_1/entrypoint.sh
diff --git a/aerospike_ee-7.0.0.9_1/Dockerfile b/aerospike_ee-7.1.0.0_1/Dockerfile
similarity index 91%
rename from aerospike_ee-7.0.0.9_1/Dockerfile
rename to aerospike_ee-7.1.0.0_1/Dockerfile
index 638ddf5..ced6219 100644
--- a/aerospike_ee-7.0.0.9_1/Dockerfile
+++ b/aerospike_ee-7.1.0.0_1/Dockerfile
@@ -5,15 +5,15 @@
 # https://github.com/aerospike/aerospike-server.docker
 #
 
-FROM debian:bookworm-slim
+FROM ubuntu:22.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/debian:bookworm-slim" \
+      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="7.0.0.9" \
+      org.opencontainers.image.version="7.1.0.0" \
       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.0.0.9/aerospike-server-enterprise_7.0.0.9_tools-10.2.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="25966b897a039002d17289ba4ad7339cd7f394d8c4858880ec89b67fe6ee4983"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.9/aerospike-server-enterprise_7.0.0.9_tools-10.2.1_debian12_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="e3dc5b43a8e426046d0cfd4721fbe25fd36b397cb723bd207b1ef16e55b7a86e"
+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="db6b69aa3e4a39ae6ec9f23845f98bfc12a2cb40672648f860cbc88e9ebc1999"
+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="2d253419b4c7a8b7a4b7416d22fbfdc46ee1e25df9c1d75ce38d3be0f62b5a53"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 
@@ -124,10 +124,7 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-deb.part - Extract tools.
-    # ar on debian10 doesn't support '--output'
-    pushd aerospike/pkg || exit 1; \
-    ar -x ../aerospike-tools*.deb; \
-    popd || exit 1; \
+    ar -x aerospike/aerospike-tools*.deb --output aerospike/pkg; \
     tar xf aerospike/pkg/data.tar.xz -C aerospike/pkg/; \
   }; \
   { \
diff --git a/aerospike_ee-7.0.0.9_1/aerospike.template.conf b/aerospike_ee-7.1.0.0_1/aerospike.template.conf
similarity index 100%
rename from aerospike_ee-7.0.0.9_1/aerospike.template.conf
rename to aerospike_ee-7.1.0.0_1/aerospike.template.conf
diff --git a/aerospike_ee-7.0.0.9_1/entrypoint.sh b/aerospike_ee-7.1.0.0_1/entrypoint.sh
similarity index 100%
rename from aerospike_ee-7.0.0.9_1/entrypoint.sh
rename to aerospike_ee-7.1.0.0_1/entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit a1054d3 into docker-library:master May 16, 2024
@pvinh-spike pvinh-spike deleted the patch-26 branch January 23, 2025 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants