Commit 882915fe authored by Min RK's avatar Min RK Committed by GitHub

Merge pull request #652 from gurvindersingh/master

upgrade tini to latest version 0.18.0
parents 0f73f748 3c0220cf
...@@ -27,8 +27,8 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ ...@@ -27,8 +27,8 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
locale-gen locale-gen
# Install Tini # Install Tini
RUN wget --quiet https://github.com/krallin/tini/releases/download/v0.10.0/tini && \ RUN wget --quiet https://github.com/krallin/tini/releases/download/v0.18.0/tini && \
echo "1361527f39190a7338a0b434bd8c88ff7233ce7b9a4876f3315c22fce7eca1b0 *tini" | sha256sum -c - && \ echo "12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855 *tini" | sha256sum -c - && \
mv tini /usr/local/bin/tini && \ mv tini /usr/local/bin/tini && \
chmod +x /usr/local/bin/tini chmod +x /usr/local/bin/tini
...@@ -96,7 +96,7 @@ EXPOSE 8888 ...@@ -96,7 +96,7 @@ EXPOSE 8888
WORKDIR $HOME WORKDIR $HOME
# Configure container startup # Configure container startup
ENTRYPOINT ["tini", "--"] ENTRYPOINT ["tini", "-g", "--"]
CMD ["start-notebook.sh"] CMD ["start-notebook.sh"]
# Add local files as late as possible to avoid cache busting # Add local files as late as possible to avoid cache busting
......
...@@ -30,10 +30,10 @@ RUN echo "LC_TYPE=en_US.UTF-8" >> /etc/default/locale ...@@ -30,10 +30,10 @@ RUN echo "LC_TYPE=en_US.UTF-8" >> /etc/default/locale
RUN locale-gen en_US en_US.UTF-8 RUN locale-gen en_US en_US.UTF-8
#build and install Tini for ppc64le #build and install Tini for ppc64le
RUN wget https://github.com/krallin/tini/archive/v0.10.0.tar.gz && \ RUN wget https://github.com/krallin/tini/archive/v0.18.0.tar.gz && \
tar zxvf v0.10.0.tar.gz && \ tar zxvf v0.18.0.tar.gz && \
rm -rf v0.10.0.tar.gz rm -rf v0.18.0.tar.gz
WORKDIR tini-0.10.0/ WORKDIR tini-0.18.0/
RUN cmake . && make install RUN cmake . && make install
RUN mv ./tini /usr/local/bin/tini && \ RUN mv ./tini /usr/local/bin/tini && \
chmod +x /usr/local/bin/tini chmod +x /usr/local/bin/tini
...@@ -87,7 +87,7 @@ WORKDIR /home/$NB_USER/work ...@@ -87,7 +87,7 @@ WORKDIR /home/$NB_USER/work
RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
# Configure container startup # Configure container startup
ENTRYPOINT ["tini", "--"] ENTRYPOINT ["tini", "-g", "--"]
CMD ["start-notebook.sh"] CMD ["start-notebook.sh"]
# Add local files as late as possible to avoid cache busting # Add local files as late as possible to avoid cache busting
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment