Minimum version supported by scripts is now 5.7.

aerospike · Nov 7, 2023 · 94973ef · 94973ef
1 parent 04fab3e
commit 94973ef
Show file tree

Hide file tree

Showing 27 changed files with 144 additions and 451 deletions.
diff --git a/build.sh b/build.sh
@@ -191,9 +191,7 @@ function do_bake_push_target() {
     platforms_str="${platforms_str%,}"
 
     local target_str="${edition}_${distro}"
-
     local output="target \"${target_str}\" {\n"
-
     local product="aerospike/aerospike-server"
 
     if [ "${edition}" != "community" ]; then

diff --git a/data/scripts/20-install-dependencies-deb.part b/data/scripts/20-install-dependencies-deb.part
@@ -1,23 +1,16 @@
   { \
     # 20-install-dependencies-deb.part - Install server and dependencies.
-    if [ "${AEROSPIKE_EDITION}" = "enterprise" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4 \
-        libldap-2.4.2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.0" | sort -V | head -1)" != "${VERSION}" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4; \
-    fi; \
+    apt-get install -y --no-install-recommends \
+      # required for EE and pre 6.0
+      libcurl4 \
+      # required for EE
+      libldap-2.4.2; \
     dpkg -i aerospike/aerospike-server-*.deb; \
     rm -rf /opt/aerospike/bin; \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      apt-get install -y --no-install-recommends \
-        python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       apt-get install -y --no-install-recommends \
         python3 \

diff --git a/data/scripts/20-install-dependencies-rpm.part b/data/scripts/20-install-dependencies-rpm.part
@@ -5,10 +5,7 @@
   }; \
   { \
     # 20-install-dependencies-rpm.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      microdnf install -y python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       microdnf install -y python3; \
     fi; \
@@ -17,8 +14,8 @@
   { \
     # 20-install-dependencies-rpm.part - Extract tools.
     pushd aerospike/pkg || exit 1; \
-    rpm2archive ../aerospike-tools*.rpm; \
-    tar xf ../aerospike-tools*.tgz -C .; \
-    rm -f ../aerospike-tools*.tgz; \
+    rpm2archive -n ../aerospike-tools*.rpm; \
+    tar xf ../aerospike-tools*.tar -C .; \
+    rm -f ../aerospike-tools*.tar; \
     popd || exit 1; \
   }; \
diff --git a/data/scripts/50-remove-prelude-rpm.part b/data/scripts/50-remove-prelude-rpm.part
@@ -1,10 +1,10 @@
   { \
     # 50-remove-prelude-rpm.part - Remove dependencies for scripts.
     microdnf remove -y \
-      # binutils - dependency issues
+      # binutils - dependency issues on ubi9
       file \
       findutils \
-      # gzip - dependency issues
+      # gzip - dependency issues on ubi9
       shadow-utils \
       tar \
       xz 2>&1; \

diff --git a/data/template/0/Dockerfile.template b/data/template/0/Dockerfile.template
@@ -6,13 +6,6 @@
 
 FROM ${LINUX_BASE}
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# By selecting "federal" you agree to the "FEDERAL_LICENSE"
-ARG AEROSPIKE_EDITION=\"${AEROSPIKE_EDITION}\"
-
 ARG AEROSPIKE_X86_64_LINK=\"${AEROSPIKE_X86_64_LINK}\"
 ARG AEROSPIKE_SHA_X86_64=\"${AEROSPIKE_SHA_X86_64}\"
 ARG AEROSPIKE_AARCH64_LINK=\"${AEROSPIKE_AARCH64_LINK}\"

diff --git a/images/5.7/community/debian10/Dockerfile b/images/5.7/community/debian10/Dockerfile
@@ -7,13 +7,6 @@
 
 FROM debian:buster-slim
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# 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/5.7.0.31/aerospike-server-community-5.7.0.31-debian10.tgz"
 ARG AEROSPIKE_SHA_X86_64="7b730abedde55a0194119ba757fa9cbf109a81ccd18cbe2d4ef2de007b749a8e"
 ARG AEROSPIKE_AARCH64_LINK=""
@@ -89,24 +82,17 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install server and dependencies.
-    if [ "${AEROSPIKE_EDITION}" = "enterprise" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4 \
-        libldap-2.4.2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.0" | sort -V | head -1)" != "${VERSION}" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4; \
-    fi; \
+    apt-get install -y --no-install-recommends \
+      # required for EE and pre 6.0
+      libcurl4 \
+      # required for EE
+      libldap-2.4.2; \
     dpkg -i aerospike/aerospike-server-*.deb; \
     rm -rf /opt/aerospike/bin; \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      apt-get install -y --no-install-recommends \
-        python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       apt-get install -y --no-install-recommends \
         python3 \

diff --git a/images/5.7/community/el8/Dockerfile b/images/5.7/community/el8/Dockerfile
@@ -7,13 +7,6 @@
 
 FROM redhat/ubi8-minimal
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# 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/5.7.0.31/aerospike-server-community-5.7.0.31-el8.tgz"
 ARG AEROSPIKE_SHA_X86_64="f6c557cf676e1dd03a13bd3592d25476d696117c699360ad50095f9d62308f09"
 ARG AEROSPIKE_AARCH64_LINK=""
@@ -94,10 +87,7 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-rpm.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      microdnf install -y python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       microdnf install -y python3; \
     fi; \
@@ -106,9 +96,9 @@ RUN \
   { \
     # 20-install-dependencies-rpm.part - Extract tools.
     pushd aerospike/pkg || exit 1; \
-    rpm2archive ../aerospike-tools*.rpm; \
-    tar xf ../aerospike-tools*.tgz -C .; \
-    rm -f ../aerospike-tools*.tgz; \
+    rpm2archive -n ../aerospike-tools*.rpm; \
+    tar xf ../aerospike-tools*.tar -C .; \
+    rm -f ../aerospike-tools*.tar; \
     popd || exit 1; \
   }; \
   { \
@@ -143,10 +133,10 @@ RUN \
   { \
     # 50-remove-prelude-rpm.part - Remove dependencies for scripts.
     microdnf remove -y \
-      # binutils - dependency issues
+      # binutils - dependency issues on ubi9
       file \
       findutils \
-      # gzip - dependency issues
+      # gzip - dependency issues on ubi9
       shadow-utils \
       tar \
       xz 2>&1; \

diff --git a/images/5.7/enterprise/debian10/Dockerfile b/images/5.7/enterprise/debian10/Dockerfile
@@ -7,13 +7,6 @@
 
 FROM debian:buster-slim
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# 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/5.7.0.31/aerospike-server-enterprise-5.7.0.31-debian10.tgz"
 ARG AEROSPIKE_SHA_X86_64="b9eaa3ae07615144849787d632a04e0f9aafad287268f33a193d99c98197fda1"
 ARG AEROSPIKE_AARCH64_LINK=""
@@ -89,24 +82,17 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install server and dependencies.
-    if [ "${AEROSPIKE_EDITION}" = "enterprise" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4 \
-        libldap-2.4.2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.0" | sort -V | head -1)" != "${VERSION}" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4; \
-    fi; \
+    apt-get install -y --no-install-recommends \
+      # required for EE and pre 6.0
+      libcurl4 \
+      # required for EE
+      libldap-2.4.2; \
     dpkg -i aerospike/aerospike-server-*.deb; \
     rm -rf /opt/aerospike/bin; \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      apt-get install -y --no-install-recommends \
-        python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       apt-get install -y --no-install-recommends \
         python3 \

diff --git a/images/5.7/enterprise/el8/Dockerfile b/images/5.7/enterprise/el8/Dockerfile
@@ -7,13 +7,6 @@
 
 FROM redhat/ubi8-minimal
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# 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/5.7.0.31/aerospike-server-enterprise-5.7.0.31-el8.tgz"
 ARG AEROSPIKE_SHA_X86_64="42f618126aff48735eb589c0306b8bdba5ba151d09892479e702e1993077672a"
 ARG AEROSPIKE_AARCH64_LINK=""
@@ -94,10 +87,7 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-rpm.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      microdnf install -y python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       microdnf install -y python3; \
     fi; \
@@ -106,9 +96,9 @@ RUN \
   { \
     # 20-install-dependencies-rpm.part - Extract tools.
     pushd aerospike/pkg || exit 1; \
-    rpm2archive ../aerospike-tools*.rpm; \
-    tar xf ../aerospike-tools*.tgz -C .; \
-    rm -f ../aerospike-tools*.tgz; \
+    rpm2archive -n ../aerospike-tools*.rpm; \
+    tar xf ../aerospike-tools*.tar -C .; \
+    rm -f ../aerospike-tools*.tar; \
     popd || exit 1; \
   }; \
   { \
@@ -143,10 +133,10 @@ RUN \
   { \
     # 50-remove-prelude-rpm.part - Remove dependencies for scripts.
     microdnf remove -y \
-      # binutils - dependency issues
+      # binutils - dependency issues on ubi9
       file \
       findutils \
-      # gzip - dependency issues
+      # gzip - dependency issues on ubi9
       shadow-utils \
       tar \
       xz 2>&1; \

diff --git a/images/6.0/community/debian11/Dockerfile b/images/6.0/community/debian11/Dockerfile
@@ -7,13 +7,6 @@
 
 FROM debian:bullseye-slim
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# 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.0.0.22/aerospike-server-community-6.0.0.22-debian11.tgz"
 ARG AEROSPIKE_SHA_X86_64="5309a184af42dc1019514f5077f841eb9176fbfbe204eacf0ff6fc3caca8963b"
 ARG AEROSPIKE_AARCH64_LINK=""
@@ -89,24 +82,17 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install server and dependencies.
-    if [ "${AEROSPIKE_EDITION}" = "enterprise" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4 \
-        libldap-2.4.2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.0" | sort -V | head -1)" != "${VERSION}" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4; \
-    fi; \
+    apt-get install -y --no-install-recommends \
+      # required for EE and pre 6.0
+      libcurl4 \
+      # required for EE
+      libldap-2.4.2; \
     dpkg -i aerospike/aerospike-server-*.deb; \
     rm -rf /opt/aerospike/bin; \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      apt-get install -y --no-install-recommends \
-        python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       apt-get install -y --no-install-recommends \
         python3 \

diff --git a/images/6.0/enterprise/debian11/Dockerfile b/images/6.0/enterprise/debian11/Dockerfile
@@ -7,13 +7,6 @@
 
 FROM debian:bullseye-slim
 
-# AEROSPIKE_EDITION - required - must be "community", "enterprise", or
-# "federal".
-# By selecting "community" you agree to the "COMMUNITY_LICENSE".
-# By selecting "enterprise" you agree to the "ENTERPRISE_LICENSE".
-# 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.0.0.22/aerospike-server-enterprise-6.0.0.22-debian11.tgz"
 ARG AEROSPIKE_SHA_X86_64="3c437d277d6c89619e4d021e71dcb33eba162c81e88b23fb1439bcf40ae7dd5e"
 ARG AEROSPIKE_AARCH64_LINK=""
@@ -89,24 +82,17 @@ RUN \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install server and dependencies.
-    if [ "${AEROSPIKE_EDITION}" = "enterprise" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4 \
-        libldap-2.4.2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.0" | sort -V | head -1)" != "${VERSION}" ]; then \
-      apt-get install -y --no-install-recommends \
-        libcurl4; \
-    fi; \
+    apt-get install -y --no-install-recommends \
+      # required for EE and pre 6.0
+      libcurl4 \
+      # required for EE
+      libldap-2.4.2; \
     dpkg -i aerospike/aerospike-server-*.deb; \
     rm -rf /opt/aerospike/bin; \
   }; \
   { \
     # 20-install-dependencies-deb.part - Install tools dependencies.
-    if ! [ "$(printf "%s\n%s" "${VERSION}" "5.1" | sort -V | head -1)" != "${VERSION}" ]; then \
-      # Tools before 5.1 need python2.
-      apt-get install -y --no-install-recommends \
-        python2; \
-    elif ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
+    if ! [ "$(printf "%s\n%s" "${VERSION}" "6.2.0.3" | sort -V | head -1)" != "${VERSION}" ]; then \
       # Tools before 6.0 need python3.
       apt-get install -y --no-install-recommends \
         python3 \