Aerospike 6.1.0.3 #13309
Merged
Aerospike 6.1.0.3 #13309
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 0a77f09:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 077f6b1..31cc9aa 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
Maintainers: Lucien Volmar <lucien@aerospike.com> (@volmarl), Michael Coberly <mcoberly@aerospike.com> (@mcoberly2), Phuc Vinh <pvinh@aerospike.com> (@pvinh-spike)
-Tags: ce-6.1.0.2
+Tags: ce-6.1.0.3
GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: 9f0fcbf7ff42f8f75c49b6b9ca02afb9b6fa4185
+GitCommit: 4557452ca88bcad1929e91bd303b522a1c242b12
-Tags: ee-6.1.0.2
+Tags: ee-6.1.0.3
GitRepo: https://github.com/aerospike/aerospike-server-enterprise.docker.git
-GitCommit: 8764b3ad467fb20c25554638abb0a76e515b6ac9
+GitCommit: 01871453aad7390a02a51dee11efe8e6a55f95cf
diff --git a/_bashbrew-list b/_bashbrew-list
index a157da2..a151121 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,2 +1,2 @@
-aerospike:ce-6.1.0.2
-aerospike:ee-6.1.0.2
+aerospike:ce-6.1.0.3
+aerospike:ee-6.1.0.3
diff --git a/aerospike_ce-6.1.0.2/.dockerignore b/aerospike_ce-6.1.0.3/.dockerignore
similarity index 100%
copy from aerospike_ce-6.1.0.2/.dockerignore
copy to aerospike_ce-6.1.0.3/.dockerignore
diff --git a/aerospike_ce-6.1.0.2/Dockerfile b/aerospike_ce-6.1.0.3/Dockerfile
similarity index 34%
rename from aerospike_ce-6.1.0.2/Dockerfile
rename to aerospike_ce-6.1.0.3/Dockerfile
index fb16535..45512a0 100644
--- a/aerospike_ce-6.1.0.2/Dockerfile
+++ b/aerospike_ce-6.1.0.3/Dockerfile
@@ -4,50 +4,56 @@
# http://github.com/aerospike/aerospike-server.docker
#
-FROM debian:buster-slim
-ENV AEROSPIKE_VERSION 6.1.0.2
-ENV AEROSPIKE_SHA256 de37fb05085a0cc4183660bb5df9d9aab8c02039af2eb544102925b11c5c216e
+FROM debian:bullseye-slim
-# Install Aerospike Server and Tools
+ENV AEROSPIKE_VERSION 6.1.0.3
+ENV AEROSPIKE_SHA256 e4f9c152209547517951b78e42ca0251bd237fe1eba65b7bef81fea94ab653c9
+ENV AS_TINI_SHA256 d1f6826dd70cdd88dde3d5a20d8ed248883a3bc2caba3071c8a3a9b0e0de5940
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# Install Aerospike Server and Tools
RUN \
- apt-get update -y \
- && apt-get install -y iproute2 procps dumb-init wget python python3 python3-distutils lua5.2 gettext-base libcurl4-openssl-dev \
- && wget "https://www.aerospike.com/artifacts/aerospike-server-community/${AEROSPIKE_VERSION}/aerospike-server-community-${AEROSPIKE_VERSION}-debian10.tgz" -O aerospike-server.tgz \
- && echo "$AEROSPIKE_SHA256 *aerospike-server.tgz" | sha256sum -c - \
- && mkdir aerospike \
+ export DEBIAN_FRONTEND=noninteractive \
+ && apt-get update -y \
+ && apt-get install -y --no-install-recommends \
+ apt-utils \
+ 2>&1 | grep -v "delaying package configuration" \
+ && apt-get install -y --no-install-recommends \
+ binutils \
+ ca-certificates \
+ gettext-base \
+ wget \
+ xz-utils \
+ && wget https://github.com/aerospike/tini/releases/download/1.0.1/as-tini-static --progress=bar:force:noscroll -O /usr/bin/as-tini-static 2>&1 \
+ && echo "$AS_TINI_SHA256 /usr/bin/as-tini-static" | sha256sum -c - \
+ && chmod +x /usr/bin/as-tini-static \
+ && wget "https://artifacts.aerospike.com/aerospike-server-community/${AEROSPIKE_VERSION}/aerospike-server-community-${AEROSPIKE_VERSION}-debian11.tgz" --progress=bar:force:noscroll -O aerospike-server.tgz 2>&1 \
+ && echo "$AEROSPIKE_SHA256 aerospike-server.tgz" | sha256sum -c - \
+ && mkdir -p aerospike/pkg \
&& tar xzf aerospike-server.tgz --strip-components=1 -C aerospike \
&& dpkg -i aerospike/aerospike-server-*.deb \
- && dpkg -i aerospike/aerospike-tools-*.deb \
- && mkdir -p /var/log/aerospike/ \
- && mkdir -p /var/run/aerospike/ \
- && rm -rf aerospike-server.tgz aerospike /var/lib/apt/lists/* \
- && rm -rf /opt/aerospike/lib/java \
- && dpkg -r wget ca-certificates openssl xz-utils\
- && dpkg --purge wget ca-certificates openssl xz-utils\
+ && ar --output aerospike/pkg -x aerospike/aerospike-tools-*.deb \
+ && tar xf aerospike/pkg/data.tar.xz -C aerospike/pkg/ \
+ && rm -rf aerospike-server.tgz /var/lib/apt/lists/* \
+ && dpkg -r apt-utils binutils ca-certificates wget xz-utils \
+ && dpkg --purge apt-utils binutils ca-certificates wget xz-utils 2>&1 \
&& apt-get purge -y \
- && apt autoremove -y \
- # Remove symbolic links of aerospike tool binaries
- # Move aerospike tool binaries to /usr/bin/
- # Remove /opt/aerospike/bin
- && find /usr/bin/ -lname '/opt/aerospike/bin/*' -delete \
- && find /opt/aerospike/bin/ -user aerospike -group aerospike -exec chown root:root {} + \
+ && apt-get autoremove -y \
+ && find aerospike/pkg/opt/aerospike/bin/ -user aerospike -group aerospike -exec chown root:root {} + \
+ && mv aerospike/pkg/etc/aerospike/astools.conf /etc/aerospike \
# Since tools release 7.0.5, asadm has been moved from /opt/aerospike/bin/asadm to /opt/aerospike/bin/asadm/asadm (inside an asadm directory)
- && if [ -d '/opt/aerospike/bin/asadm' ]; \
- then \
- mv /opt/aerospike/bin/asadm /usr/lib/; \
+ && if [ -d 'aerospike/pkg/opt/aerospike/bin/asadm' ]; then \
+ mv aerospike/pkg/opt/aerospike/bin/asadm /usr/lib/; \
ln -s /usr/lib/asadm/asadm /usr/bin/asadm; \
# Since tools release 7.1.1, asinfo has been moved from /opt/aerospike/bin/asinfo to /opt/aerospike/bin/asadm/asinfo (inside an asadm directory)
- if [ -f /usr/lib/asadm/asinfo ]; \
- then \
+ if [ -f /usr/lib/asadm/asinfo ]; then \
ln -s /usr/lib/asadm/asinfo /usr/bin/asinfo; \
fi \
fi \
- && mv /opt/aerospike/bin/* /usr/bin/ \
- && rm -rf /opt/aerospike/bin
-
+ && rm -rf /opt/aerospike/bin \
+ && rm -rf aerospike
# Add the Aerospike configuration specific to this dockerfile
@@ -68,9 +74,10 @@ COPY entrypoint.sh /entrypoint.sh
#
EXPOSE 3000 3001 3002
-# Runs as PID 1 /usr/bin/dumb-init -- /my/script --with --args"
-# https://github.com/Yelp/dumb-init
-ENTRYPOINT ["/usr/bin/dumb-init", "--", "/entrypoint.sh"]
+# Tini init set to restart ASD on SIGUSR1 and terminate ASD on SIGTERM
+ENTRYPOINT ["/usr/bin/as-tini-static", "-r", "SIGUSR1", "-t", "SIGTERM", "--", "/entrypoint.sh"]
+
+
# Execute the run script in foreground mode
CMD ["asd"]
diff --git a/aerospike_ce-6.1.0.2/aerospike.template.conf b/aerospike_ce-6.1.0.3/aerospike.template.conf
similarity index 100%
rename from aerospike_ce-6.1.0.2/aerospike.template.conf
rename to aerospike_ce-6.1.0.3/aerospike.template.conf
diff --git a/aerospike_ce-6.1.0.2/entrypoint.sh b/aerospike_ce-6.1.0.3/entrypoint.sh
similarity index 95%
rename from aerospike_ce-6.1.0.2/entrypoint.sh
rename to aerospike_ce-6.1.0.3/entrypoint.sh
index 2d93152..2f07baf 100755
--- a/aerospike_ce-6.1.0.2/entrypoint.sh
+++ b/aerospike_ce-6.1.0.3/entrypoint.sh
@@ -51,6 +51,4 @@ if [ "$1" = 'asd' ]; then
fi
-# the command isn't asd so run the command the user specified
-
exec "$@"
diff --git a/aerospike_ce-6.1.0.2/.dockerignore b/aerospike_ee-6.1.0.3/.dockerignore
similarity index 86%
rename from aerospike_ce-6.1.0.2/.dockerignore
rename to aerospike_ee-6.1.0.3/.dockerignore
index e5b80c1..f6acf05 100644
diff --git a/aerospike_ee-6.1.0.2/Dockerfile b/aerospike_ee-6.1.0.3/Dockerfile
similarity index 46%
rename from aerospike_ee-6.1.0.2/Dockerfile
rename to aerospike_ee-6.1.0.3/Dockerfile
index 12504cd..5462e3c 100644
--- a/aerospike_ee-6.1.0.2/Dockerfile
+++ b/aerospike_ee-6.1.0.3/Dockerfile
@@ -4,52 +4,61 @@
# http://github.com/aerospike/aerospike-server-enterprise.docker
#
-FROM debian:buster-slim
-ENV AEROSPIKE_VERSION 6.1.0.2
-ENV AEROSPIKE_SHA256 efd49204813876c5b3b3064b875efccfd49fa2a7e4840161e411988fc87f012f
+FROM debian:bullseye-slim
+
+ENV AEROSPIKE_VERSION 6.1.0.3
+ENV AEROSPIKE_SHA256 de62082abe7c5fb040fc5eaaed22274142d96cbcd7dfce7530a52d65bce8b277
ENV AS_TINI_SHA256 d1f6826dd70cdd88dde3d5a20d8ed248883a3bc2caba3071c8a3a9b0e0de5940
-# Install Aerospike Server and Tools
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# Install Aerospike Server and Tools
RUN \
- apt-get update -y \
- && apt-get install -y iproute2 procps wget python python3 python3-distutils lua5.2 gettext-base libldap-dev libcurl4-openssl-dev \
- && wget https://github.com/aerospike/tini/releases/download/1.0.1/as-tini-static -O /usr/bin/as-tini-static \
+ export DEBIAN_FRONTEND=noninteractive \
+ && apt-get update -y \
+ && apt-get install -y --no-install-recommends \
+ apt-utils \
+ 2>&1 | grep -v "delaying package configuration" \
+ && apt-get install -y --no-install-recommends \
+ binutils \
+ ca-certificates \
+ gettext-base \
+ wget \
+ xz-utils \
+ # Enterprise only dependencies
+ && apt-get install -y --no-install-recommends \
+ libcurl4 \
+ libldap-2.4.2 \
+ && wget https://github.com/aerospike/tini/releases/download/1.0.1/as-tini-static --progress=bar:force:noscroll -O /usr/bin/as-tini-static 2>&1 \
&& echo "$AS_TINI_SHA256 /usr/bin/as-tini-static" | sha256sum -c - \
&& chmod +x /usr/bin/as-tini-static \
- && wget "https://download.aerospike.com/artifacts/aerospike-server-enterprise/${AEROSPIKE_VERSION}/aerospike-server-enterprise-${AEROSPIKE_VERSION}-debian10.tgz" -O aerospike-server.tgz \
- && echo "$AEROSPIKE_SHA256 *aerospike-server.tgz" | sha256sum -c - \
- && mkdir aerospike \
+ && wget "https://artifacts.aerospike.com/aerospike-server-enterprise/${AEROSPIKE_VERSION}/aerospike-server-enterprise-${AEROSPIKE_VERSION}-debian11.tgz" --progress=bar:force:noscroll -O aerospike-server.tgz 2>&1 \
+ && echo "$AEROSPIKE_SHA256 aerospike-server.tgz" | sha256sum -c - \
+ && mkdir -p aerospike/pkg \
&& tar xzf aerospike-server.tgz --strip-components=1 -C aerospike \
&& dpkg -i aerospike/aerospike-server-*.deb \
- && dpkg -i aerospike/aerospike-tools-*.deb \
- && mkdir -p /var/log/aerospike/ \
- && mkdir -p /var/run/aerospike/ \
- && rm -rf aerospike-server.tgz aerospike /var/lib/apt/lists/* \
- && rm -rf /opt/aerospike/lib/java \
- && dpkg -r wget ca-certificates openssl xz-utils\
- && dpkg --purge wget ca-certificates openssl xz-utils\
+ && ar --output aerospike/pkg -x aerospike/aerospike-tools-*.deb \
+ && tar xf aerospike/pkg/data.tar.xz -C aerospike/pkg/ \
+ && rm -rf aerospike-server.tgz /var/lib/apt/lists/* \
+ && dpkg -r apt-utils binutils ca-certificates wget xz-utils \
+ && dpkg --purge apt-utils binutils ca-certificates wget xz-utils 2>&1 \
&& apt-get purge -y \
- && apt autoremove -y \
- # Remove symbolic links of aerospike tool binaries
- # Move aerospike tool binaries to /usr/bin/
- # Remove /opt/aerospike/bin
- && find /usr/bin/ -lname '/opt/aerospike/bin/*' -delete \
- && find /opt/aerospike/bin/ -user aerospike -group aerospike -exec chown root:root {} + \
+ && apt-get autoremove -y \
+ && find aerospike/pkg/opt/aerospike/bin/ -user aerospike -group aerospike -exec chown root:root {} + \
+ && mv aerospike/pkg/etc/aerospike/astools.conf /etc/aerospike \
# Since tools release 7.0.5, asadm has been moved from /opt/aerospike/bin/asadm to /opt/aerospike/bin/asadm/asadm (inside an asadm directory)
- && if [ -d '/opt/aerospike/bin/asadm' ]; \
- then \
- mv /opt/aerospike/bin/asadm /usr/lib/; \
+ && if [ -d 'aerospike/pkg/opt/aerospike/bin/asadm' ]; then \
+ mv aerospike/pkg/opt/aerospike/bin/asadm /usr/lib/; \
ln -s /usr/lib/asadm/asadm /usr/bin/asadm; \
# Since tools release 7.1.1, asinfo has been moved from /opt/aerospike/bin/asinfo to /opt/aerospike/bin/asadm/asinfo (inside an asadm directory)
- if [ -f /usr/lib/asadm/asinfo ]; \
- then \
+ if [ -f /usr/lib/asadm/asinfo ]; then \
ln -s /usr/lib/asadm/asinfo /usr/bin/asinfo; \
fi \
fi \
- && mv /opt/aerospike/bin/* /usr/bin/ \
- && rm -rf /opt/aerospike/bin
+ && rm -rf /opt/aerospike/bin \
+ && rm -rf aerospike
+
# Add the Aerospike configuration specific to this dockerfile
COPY aerospike.template.conf /etc/aerospike/aerospike.template.conf
diff --git a/aerospike_ee-6.1.0.2/aerospike.template.conf b/aerospike_ee-6.1.0.3/aerospike.template.conf
similarity index 100%
rename from aerospike_ee-6.1.0.2/aerospike.template.conf
rename to aerospike_ee-6.1.0.3/aerospike.template.conf
diff --git a/aerospike_ee-6.1.0.2/entrypoint.sh b/aerospike_ee-6.1.0.3/entrypoint.sh
similarity index 96%
rename from aerospike_ee-6.1.0.2/entrypoint.sh
rename to aerospike_ee-6.1.0.3/entrypoint.sh
index c6490b5..9a7ecaf 100755
--- a/aerospike_ee-6.1.0.2/entrypoint.sh
+++ b/aerospike_ee-6.1.0.3/entrypoint.sh
@@ -52,6 +52,4 @@ if [ "$1" = 'asd' ]; then
fi
-# the command isn't asd so run the command the user specified
-
exec "$@"Relevant Maintainers:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://download.aerospike.com/download/server/notes.html