Aerospike 6.2.0.3

[mcoberly2]

https://download.aerospike.com/download/server/notes.html

[github-actions]

Diff for 5d2cb92:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5f7d1fb..84546f9 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-6.2.0.2
+Tags: ce-6.2.0.3, ce-6.2.0.3_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: 26089140713466195470d5d246fdd2bda5b82180
+GitCommit: 7aac053d7ed9d2ee32f83edea7e31fdf65e10617
 Directory: community/debian11
 
-Tags: ee-6.2.0.2
+Tags: ee-6.2.0.3, ee-6.2.0.3_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: 26089140713466195470d5d246fdd2bda5b82180
+GitCommit: 7aac053d7ed9d2ee32f83edea7e31fdf65e10617
 Directory: enterprise/debian11
diff --git a/_bashbrew-list b/_bashbrew-list
index add7c5f..800836d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,2 +1,4 @@
-aerospike:ce-6.2.0.2
-aerospike:ee-6.2.0.2
+aerospike:ce-6.2.0.3
+aerospike:ce-6.2.0.3_1
+aerospike:ee-6.2.0.3
+aerospike:ee-6.2.0.3_1
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index add7c5f..ae55f67 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-aerospike:ce-6.2.0.2
-aerospike:ee-6.2.0.2
+aerospike:ce-6.2.0.3_1
+aerospike:ee-6.2.0.3_1
diff --git a/aerospike_ce-6.2.0.2/Dockerfile b/aerospike_ce-6.2.0.3_1/Dockerfile
similarity index 92%
rename from aerospike_ce-6.2.0.2/Dockerfile
rename to aerospike_ce-6.2.0.3_1/Dockerfile
index b054101..2bfc1c4 100644
--- a/aerospike_ce-6.2.0.2/Dockerfile
+++ b/aerospike_ce-6.2.0.3_1/Dockerfile
@@ -7,8 +7,6 @@
 
 FROM debian:bullseye-slim
 
-ARG DEBUG="false"
-
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
 # "federal".
 # By selecting "community" you agree to the "COMMUNITY_LICENSE".
@@ -16,10 +14,10 @@ ARG DEBUG="false"
 # 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.2.0.2/aerospike-server-community_6.2.0.2_tools-8.0.4_debian11_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="27a5bdbe844212dff4e319961b9b1387ff16360e9d5544a9de6e1d0e64dbbe78"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.2.0.2/aerospike-server-community_6.2.0.2_tools-8.0.4_debian11_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="bdd69acce22e9019e3c662d45f17e787f8570c80fc5dbecc0f8682cb511cb467"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.2.0.3/aerospike-server-community_6.2.0.3_tools-8.1.0_debian11_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="622b7b8d694a54ee42515bc56aa9aeb006c1f731b10df82777cbf1f154b12fff"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/6.2.0.3/aerospike-server-community_6.2.0.3_tools-8.1.0_debian11_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="7218303567741912537b564cf50580d37b84b615aa01965ecfba20596ccfb594"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 
@@ -127,6 +125,9 @@ RUN \
     # 30-install-tools.part - install asinfo and asadm.
     find aerospike/pkg/opt/aerospike/bin/ -user aerospike -group aerospike -exec chown root:root {} +; \
     mv aerospike/pkg/etc/aerospike/astools.conf /etc/aerospike; \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2" | sort -V | head -1)" != "${VERSION}" ]; then \
+       mv aerospike/pkg/opt/aerospike/bin/aql /usr/bin; \
+    fi; \
     if [ -d 'aerospike/pkg/opt/aerospike/bin/asadm' ]; then \
       # Since tools release 7.0.5, asadm has been moved from
       # /opt/aerospike/bin/asadm to /opt/aerospike/bin/asadm/asadm
diff --git a/aerospike_ce-6.2.0.2/aerospike.template.conf b/aerospike_ce-6.2.0.3_1/aerospike.template.conf
similarity index 100%
rename from aerospike_ce-6.2.0.2/aerospike.template.conf
rename to aerospike_ce-6.2.0.3_1/aerospike.template.conf
diff --git a/aerospike_ce-6.2.0.2/entrypoint.sh b/aerospike_ce-6.2.0.3_1/entrypoint.sh
similarity index 100%
rename from aerospike_ce-6.2.0.2/entrypoint.sh
rename to aerospike_ce-6.2.0.3_1/entrypoint.sh
diff --git a/aerospike_ee-6.2.0.2/Dockerfile b/aerospike_ee-6.2.0.3_1/Dockerfile
similarity index 92%
rename from aerospike_ee-6.2.0.2/Dockerfile
rename to aerospike_ee-6.2.0.3_1/Dockerfile
index b13f6b5..5255e9a 100644
--- a/aerospike_ee-6.2.0.2/Dockerfile
+++ b/aerospike_ee-6.2.0.3_1/Dockerfile
@@ -7,8 +7,6 @@
 
 FROM debian:bullseye-slim
 
-ARG DEBUG="false"
-
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
 # "federal".
 # By selecting "community" you agree to the "COMMUNITY_LICENSE".
@@ -16,10 +14,10 @@ ARG DEBUG="false"
 # 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.2.0.2/aerospike-server-enterprise_6.2.0.2_tools-8.0.4_debian11_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="0eeb32a9b5da70dcc9f9e155e57ec0d8dfcc17c471ba6e844b2d7449cf577c34"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.2.0.2/aerospike-server-enterprise_6.2.0.2_tools-8.0.4_debian11_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="2d250ca285a7c5b30b9534888a462ce742b0d812f4f97b954a554884e8ede122"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.2.0.3/aerospike-server-enterprise_6.2.0.3_tools-8.1.0_debian11_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="2c3cd14843a62aaaf158dcab1e16f16050e170a0d591fdb56805defb93a8e5bf"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/6.2.0.3/aerospike-server-enterprise_6.2.0.3_tools-8.1.0_debian11_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="367357112e4da434814617dad19cc5c0cf8211de67384a161a3511b2a86453da"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 
@@ -127,6 +125,9 @@ RUN \
     # 30-install-tools.part - install asinfo and asadm.
     find aerospike/pkg/opt/aerospike/bin/ -user aerospike -group aerospike -exec chown root:root {} +; \
     mv aerospike/pkg/etc/aerospike/astools.conf /etc/aerospike; \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2" | sort -V | head -1)" != "${VERSION}" ]; then \
+       mv aerospike/pkg/opt/aerospike/bin/aql /usr/bin; \
+    fi; \
     if [ -d 'aerospike/pkg/opt/aerospike/bin/asadm' ]; then \
       # Since tools release 7.0.5, asadm has been moved from
       # /opt/aerospike/bin/asadm to /opt/aerospike/bin/asadm/asadm
diff --git a/aerospike_ee-6.2.0.2/aerospike.template.conf b/aerospike_ee-6.2.0.3_1/aerospike.template.conf
similarity index 100%
rename from aerospike_ee-6.2.0.2/aerospike.template.conf
rename to aerospike_ee-6.2.0.3_1/aerospike.template.conf
diff --git a/aerospike_ee-6.2.0.2/entrypoint.sh b/aerospike_ee-6.2.0.3_1/entrypoint.sh
similarity index 100%
rename from aerospike_ee-6.2.0.2/entrypoint.sh
rename to aerospike_ee-6.2.0.3_1/entrypoint.sh

Relevant Maintainers:

• aerospike: @volmarl @mcoberly2 @pvinh-spike @kportertx

[yosifkit]

Just a note that your first commit was mostly correct, just a small typo. The library file works as-is (since we combine identical blocks when processing), but thought I would drop a note about it if it makes your maintenance easier in future PRs.

-Tags: ce-6.2.0.3. ce-6.2.0.3_1
+Tags: ce-6.2.0.3, ce-6.2.0.3_1

[mcoberly2]

@yosifkit Thanks for the information. In the future I will attempt to align the release versions together minus typos 😵‍💫