Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aerospike 7.0.0.4 #16251

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Aerospike 7.0.0.4 #16251

merged 1 commit into from
Feb 15, 2024

Conversation

pvinh-spike
Copy link
Contributor

Copy link

Diff for d44fb7f:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 677a707..a864207 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.3, ce-7.0.0.3_1
+Tags: ce-7.0.0.4, ce-7.0.0.4_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: e0ed668291dba3144e51546c3b80e9854cc1db24
+GitCommit: 2870ae25bbbb0873e1b0053c2c04817762b50dc5
 Directory: community/debian12
 
-Tags: ee-7.0.0.3, ee-7.0.0.3_1
+Tags: ee-7.0.0.4, ee-7.0.0.4_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: e0ed668291dba3144e51546c3b80e9854cc1db24
+GitCommit: 2870ae25bbbb0873e1b0053c2c04817762b50dc5
 Directory: enterprise/debian12
diff --git a/_bashbrew-list b/_bashbrew-list
index cd2a762..42f3e1e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
-aerospike:ce-7.0.0.3
-aerospike:ce-7.0.0.3_1
-aerospike:ee-7.0.0.3
-aerospike:ee-7.0.0.3_1
+aerospike:ce-7.0.0.4
+aerospike:ce-7.0.0.4_1
+aerospike:ee-7.0.0.4
+aerospike:ee-7.0.0.4_1
diff --git a/aerospike_ce-7.0.0.3_1/Dockerfile b/aerospike_ce-7.0.0.4_1/Dockerfile
similarity index 93%
rename from aerospike_ce-7.0.0.3_1/Dockerfile
rename to aerospike_ce-7.0.0.4_1/Dockerfile
index 6d3e319..fea2de7 100644
--- a/aerospike_ce-7.0.0.3_1/Dockerfile
+++ b/aerospike_ce-7.0.0.4_1/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="7.0.0.3" \
+      org.opencontainers.image.version="7.0.0.4" \
       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.3/aerospike-server-community_7.0.0.3_tools-10.0.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="090a8aaeed449ba9552ae092df066a18dc9b4532dc88568f8c7bf9693a952ce4"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.3/aerospike-server-community_7.0.0.3_tools-10.0.1_debian12_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="f5df3cc747466ade143b396999b18df499263377871443240f70f60ed7076cb9"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.4/aerospike-server-community_7.0.0.4_tools-10.2.1_debian12_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="e546d5ba99ad621eebe3264635cd8f549390d79c84ff153bcd22e30f562a68c2"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.4/aerospike-server-community_7.0.0.4_tools-10.2.1_debian12_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="8b64965f03c36aa52dbb37a69f07fc4c06e2eb2b6ab826fc21bd13a06ac11ce1"
 
 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]+)*/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/')"; \
+    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)"; \
   }; \
   { \
     # 10-common.part - Install tini.
diff --git a/aerospike_ce-7.0.0.3_1/aerospike.template.conf b/aerospike_ce-7.0.0.4_1/aerospike.template.conf
similarity index 100%
rename from aerospike_ce-7.0.0.3_1/aerospike.template.conf
rename to aerospike_ce-7.0.0.4_1/aerospike.template.conf
diff --git a/aerospike_ce-7.0.0.3_1/entrypoint.sh b/aerospike_ce-7.0.0.4_1/entrypoint.sh
similarity index 100%
rename from aerospike_ce-7.0.0.3_1/entrypoint.sh
rename to aerospike_ce-7.0.0.4_1/entrypoint.sh
diff --git a/aerospike_ee-7.0.0.3_1/Dockerfile b/aerospike_ee-7.0.0.4_1/Dockerfile
similarity index 93%
rename from aerospike_ee-7.0.0.3_1/Dockerfile
rename to aerospike_ee-7.0.0.4_1/Dockerfile
index 55b7f60..27b0b8e 100644
--- a/aerospike_ee-7.0.0.3_1/Dockerfile
+++ b/aerospike_ee-7.0.0.4_1/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="7.0.0.3" \
+      org.opencontainers.image.version="7.0.0.4" \
       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.3/aerospike-server-enterprise_7.0.0.3_tools-10.0.1_debian12_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="92beb00c6dce396265407a2c8080a9323d26d6d5c4efbc1f674ede5705058a24"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.3/aerospike-server-enterprise_7.0.0.3_tools-10.0.1_debian12_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="8b6735fcec0658e46fc973c182892a0eb4324bc7799b2a9a60b706e4b76fe19a"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.4/aerospike-server-enterprise_7.0.0.4_tools-10.2.1_debian12_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="83fd1db4a54cc871acb25d84a003120a0f0b0a394eca6a8acfb725faabbe3558"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.4/aerospike-server-enterprise_7.0.0.4_tools-10.2.1_debian12_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="1fb4c8fc0f2b60327b5be61ea5d444ca8d9323b00df22b897638bc331371cc7b"
 
 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]+)*/" <<<"${AEROSPIKE_X86_64_LINK}" | tr -d '/')"; \
+    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)"; \
   }; \
   { \
     # 10-common.part - Install tini.
diff --git a/aerospike_ee-7.0.0.3_1/aerospike.template.conf b/aerospike_ee-7.0.0.4_1/aerospike.template.conf
similarity index 100%
rename from aerospike_ee-7.0.0.3_1/aerospike.template.conf
rename to aerospike_ee-7.0.0.4_1/aerospike.template.conf
diff --git a/aerospike_ee-7.0.0.3_1/entrypoint.sh b/aerospike_ee-7.0.0.4_1/entrypoint.sh
similarity index 100%
rename from aerospike_ee-7.0.0.3_1/entrypoint.sh
rename to aerospike_ee-7.0.0.4_1/entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit a7bebaf into docker-library:master Feb 15, 2024
7 checks passed
@pvinh-spike pvinh-spike deleted the patch-22 branch February 15, 2024 01:12
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