Skip to content

Commit

Permalink
Add tini to ischool & publichelath hubs
Browse files Browse the repository at this point in the history
We inherit from the geospatial rocker images, which ship
with the s6 process manager. However, JupyterHub doesn't
launch them using that. We consistently use tini across
all our images instead.

Ref berkeley-dsep-infra#2878
Ref berkeley-dsep-infra#2891
  • Loading branch information
yuvipanda committed Oct 19, 2021
1 parent e98e99d commit f024100
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions deployments/ischool/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ RUN apt-get update > /dev/null && \
libssl1.1 \
fonts-symbola \
gdebi-core \
tini \
nodejs npm > /dev/null && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand Down Expand Up @@ -68,3 +69,6 @@ RUN install2.r --error --skipinstalled \
Hmisc plm patchwork # For https://github.com/berkeley-dsep-infra/datahub/issues/2519 \
fpp3 # For https://github.com/berkeley-dsep-infra/datahub/issues/2510 && \
rm -rf /tmp/downloaded_packages


ENTRYPOINT ["tini", "--"]
3 changes: 3 additions & 0 deletions deployments/publichealth/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ RUN apt-get update > /dev/null && \
libssl1.1 \
fonts-symbola \
gdebi-core \
tini \
nodejs npm > /dev/null && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand Down Expand Up @@ -72,3 +73,5 @@ RUN r /tmp/r-packages/ph-142.r

COPY r-packages/ph-252.r /tmp/r-packages/
RUN r /tmp/r-packages/ph-252.r

ENTRYPOINT ["tini", "--"]

0 comments on commit f024100

Please sign in to comment.