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

Update Aerospike 5.7.0.9 #11549

Closed
wants to merge 1 commit into from
Closed

Conversation

mcoberly2
Copy link
Contributor

@github-actions
Copy link

Diff for b90885a:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5287b13..f13eea8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Lucien Volmar <[email protected]> (@volmarl), Michael Coberly <[email protected]> (@mcoberly2), Phuc Vinh <[email protected]> (@pvinh-spike)
 
-Tags: ce-5.7.0.8
+Tags: ce-5.7.0.9
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: 9316b9e2dca468e2bbed08e12550f5d208447a14
+GitCommit: 21dff5b3303fcfae7ef5579471e559ed30d7060e
 
-Tags: ee-5.7.0.8
+Tags: ee-5.7.0.9
 GitRepo: https://github.com/aerospike/aerospike-server-enterprise.docker.git
-GitCommit: 2d11fe93cec1c1adc86968a26b1b8827f61dc81f
+GitCommit: 651beeaf2d7a400a22731ea57d27a38d1b26ab31
diff --git a/_bashbrew-list b/_bashbrew-list
index b9d4e60..a844aed 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,2 +1,2 @@
-aerospike:ce-5.7.0.8
-aerospike:ee-5.7.0.8
+aerospike:ce-5.7.0.9
+aerospike:ee-5.7.0.9
diff --git a/aerospike_ce-5.7.0.8/.dockerignore b/aerospike_ce-5.7.0.9/.dockerignore
similarity index 100%
rename from aerospike_ce-5.7.0.8/.dockerignore
rename to aerospike_ce-5.7.0.9/.dockerignore
diff --git a/aerospike_ce-5.7.0.8/Dockerfile b/aerospike_ce-5.7.0.9/Dockerfile
similarity index 94%
rename from aerospike_ce-5.7.0.8/Dockerfile
rename to aerospike_ce-5.7.0.9/Dockerfile
index a562188..690ceb2 100644
--- a/aerospike_ce-5.7.0.8/Dockerfile
+++ b/aerospike_ce-5.7.0.9/Dockerfile
@@ -6,8 +6,8 @@
 
 FROM debian:buster-slim
 
-ENV AEROSPIKE_VERSION 5.7.0.8
-ENV AEROSPIKE_SHA256 587baea6f9ff594ae168a1dd21becccfd9cf4298cb073bb6f13e0ca72b6c42c0
+ENV AEROSPIKE_VERSION 5.7.0.9
+ENV AEROSPIKE_SHA256 f9361c89bd60229f54d1f036ba6f6dcda5917d585efb289df43f20cd11ef223c
 
 # Install Aerospike Server and Tools
 
diff --git a/aerospike_ce-5.7.0.8/aerospike.template.conf b/aerospike_ce-5.7.0.9/aerospike.template.conf
similarity index 100%
rename from aerospike_ce-5.7.0.8/aerospike.template.conf
rename to aerospike_ce-5.7.0.9/aerospike.template.conf
diff --git a/aerospike_ce-5.7.0.8/entrypoint.sh b/aerospike_ce-5.7.0.9/entrypoint.sh
similarity index 100%
rename from aerospike_ce-5.7.0.8/entrypoint.sh
rename to aerospike_ce-5.7.0.9/entrypoint.sh
diff --git a/aerospike_ee-5.7.0.8/Dockerfile b/aerospike_ee-5.7.0.9/Dockerfile
similarity index 69%
rename from aerospike_ee-5.7.0.8/Dockerfile
rename to aerospike_ee-5.7.0.9/Dockerfile
index 21a7214..cc525cd 100644
--- a/aerospike_ee-5.7.0.8/Dockerfile
+++ b/aerospike_ee-5.7.0.9/Dockerfile
@@ -6,14 +6,19 @@
 
 FROM debian:buster-slim
 
-ENV AEROSPIKE_VERSION 5.7.0.8
-ENV AEROSPIKE_SHA256 cb3e0c376ae4be9253fa4e44a005599684bf2aec66211fae87edab20b56eed0a
+ENV AEROSPIKE_VERSION 5.7.0.9
+ENV AEROSPIKE_SHA256 90e711b39039ccd62d49a90b1263c74718daf715e95cba68f2b001b0a635d8de
 
 # 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 libldap-dev libcurl4-openssl-dev \
+  && 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.0/tini-static -O /usr/bin/tini-static \
+  && wget https://github.com/aerospike/tini/releases/download/1.0.0/tini-static.sha256sum -O /usr/bin/tini-static.sha256sum \
+  && cd /usr/bin && sha256sum -c /usr/bin/tini-static.sha256sum && cd -\
+  && rm /usr/bin/tini-static.sha256sum \
+  && chmod +x /usr/bin/tini-static \
   && wget "https://www.aerospike.com/enterprise/download/server/${AEROSPIKE_VERSION}/artifact/debian10" -O aerospike-server.tgz \
   && echo "$AEROSPIKE_SHA256 *aerospike-server.tgz" | sha256sum -c - \
   && mkdir aerospike \
@@ -55,9 +59,8 @@ 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
+# Tini init set to restart ASD on SIGUSR1 and terminate ASD on SIGTERM
+ENTRYPOINT ["/usr/bin/tini-static", "-r", "SIGUSR1", "-t", "SIGTERM", "--", "/entrypoint.sh"]
 
-ENTRYPOINT ["/usr/bin/dumb-init", "--", "/entrypoint.sh"]
 # Execute the run script in foreground mode
 CMD ["asd"]
diff --git a/aerospike_ee-5.7.0.8/aerospike.template.conf b/aerospike_ee-5.7.0.9/aerospike.template.conf
similarity index 100%
rename from aerospike_ee-5.7.0.8/aerospike.template.conf
rename to aerospike_ee-5.7.0.9/aerospike.template.conf
diff --git a/aerospike_ee-5.7.0.8/entrypoint.sh b/aerospike_ee-5.7.0.9/entrypoint.sh
similarity index 100%
rename from aerospike_ee-5.7.0.8/entrypoint.sh
rename to aerospike_ee-5.7.0.9/entrypoint.sh

Relevant Maintainers:

@yosifkit
Copy link
Member

yosifkit commented Jan 5, 2022

This includes the same changes that #11449 had, and so I have the same feedback.

@yosifkit
Copy link
Member

closed by #11736

@yosifkit yosifkit closed this Jan 25, 2022
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