Merge pull request #16 from Anaconda-Platform/tini

implement tini entrypoint
anaconda · Jan 27, 2021 · 37111d4 · 37111d4
2 parents 565b0c1 + 04e3347
commit 37111d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/centos7.dockerfile b/centos7.dockerfile
@@ -15,16 +15,14 @@ ENV LANG=en_US.UTF-8 \
     PATH=/opt/conda/bin:$PATH 
 
 ### Install and configure miniconda
-ADD https://repo.anaconda.com/miniconda/Miniconda3-py37_4.9.2-Linux-x86_64.sh miniconda.sh
-RUN yum install -y bzip2 && \
-    bash miniconda.sh -u -b -p /opt/conda && \
-    rm -f miniconda.sh && \
-    chmod -R 755 /opt/conda
 COPY ./etc/condarc /opt/conda/.condarc
-
-### Add required packages
-RUN conda install anaconda-project=0.8.4 anaconda-client conda-repo-cli conda-token --yes && \
-    conda clean --all --yes
+RUN yum install -y wget bzip2 \
+    && wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.9.2-Linux-x86_64.sh -O miniconda.sh \
+    && bash miniconda.sh -u -b -p /opt/conda \
+    && conda install anaconda-project=0.8.4 anaconda-client conda-repo-cli conda-token tini --yes \
+    && conda clean --all --yes \
+    && rm -f miniconda.sh \
+    && chmod -R 755 /opt/conda
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 
@@ -41,4 +39,6 @@ USER 1001
 
 EXPOSE 8086
 
+ENTRYPOINT ["tini", "-g", "--"]
+
 CMD ["/usr/libexec/s2i/usage"]
diff --git a/ubi7.dockerfile b/ubi7.dockerfile
@@ -15,16 +15,14 @@ ENV LANG=en_US.UTF-8 \
     PATH=/opt/conda/bin:$PATH 
 
 ### Install and configure miniconda
-ADD https://repo.anaconda.com/miniconda/Miniconda3-py37_4.9.2-Linux-x86_64.sh miniconda.sh
-RUN yum install -y bzip2 && \
-    bash miniconda.sh -u -b -p /opt/conda && \
-    rm -f miniconda.sh && \
-    chmod -R 755 /opt/conda
 COPY ./etc/condarc /opt/conda/.condarc
-
-### Add required packages
-RUN conda install anaconda-project=0.8.4 anaconda-client conda-repo-cli conda-token --yes && \
-    conda clean --all --yes
+RUN yum install -y wget bzip2 \
+    && wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.9.2-Linux-x86_64.sh -O miniconda.sh \
+    && bash miniconda.sh -u -b -p /opt/conda \
+    && conda install anaconda-project=0.8.4 anaconda-client conda-repo-cli conda-token tini --yes \
+    && conda clean --all --yes \
+    && rm -f miniconda.sh \
+    && chmod -R 755 /opt/conda
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 
@@ -41,4 +39,6 @@ USER 1001
 
 EXPOSE 8086
 
+ENTRYPOINT ["tini", "-g", "--"]
+
 CMD ["/usr/libexec/s2i/usage"]