Merge pull request #11 from isqad/master

feature: bundler v1.16.2 and tini as init process
abak-press · Jun 4, 2018 · 69dfde7 · 69dfde7
2 parents 53590c3 + e5aa867
commit 69dfde7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/1.9/Dockerfile b/1.9/Dockerfile
@@ -55,9 +55,15 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1
 RUN echo 'gem: --no-rdoc --no-ri --no-document' > /root/.gemrc \
   && ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts \
   && gem update --system 2.6.1 \
-  && gem install bundler --version 1.15.1 \
+  && gem install bundler --version 1.16.2 \
   && bundle config --global jobs 7 \
   && bundle config git.allow_insecure true \
   && bundle config --global build.nokogiri --use-system-libraries
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /app
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
@@ -62,9 +62,15 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1
 RUN echo 'gem: --no-rdoc --no-ri --no-document' > /root/.gemrc \
   && ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts \
   && gem update --system 2.6.1 \
-  && gem install bundler --version 1.15.1 \
+  && gem install bundler --version 1.16.2 \
   && bundle config --global jobs 7 \
   && bundle config git.allow_insecure true \
   && bundle config --global build.nokogiri --use-system-libraries
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /app
diff --git a/2.3/Dockerfile b/2.3/Dockerfile
@@ -62,9 +62,15 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1
 RUN echo 'gem: --no-rdoc --no-ri --no-document' > /root/.gemrc \
   && ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts \
   && gem update --system 2.6.1 \
-  && gem install bundler --version 1.15.1 \
+  && gem install bundler --version 1.16.2 \
   && bundle config --global jobs 7 \
   && bundle config git.allow_insecure true \
   && bundle config --global build.nokogiri --use-system-libraries
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /app
diff --git a/2.4/Dockerfile b/2.4/Dockerfile
@@ -62,9 +62,15 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1
 RUN echo 'gem: --no-rdoc --no-ri --no-document' > /root/.gemrc \
   && ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts \
   && gem update --system 2.6.1 \
-  && gem install bundler --version 1.15.1 \
+  && gem install bundler --version 1.16.2 \
   && bundle config --global jobs 7 \
   && bundle config git.allow_insecure true \
   && bundle config --global build.nokogiri --use-system-libraries
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /app