Skip to content

Commit 6174fa3

Browse files
committed
fix: supervisord emit reap process
1 parent 27d96bd commit 6174fa3

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

Dockerfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ MAINTAINER Doro Wu <fcwu.tw@gmail.com>
44
ENV DEBIAN_FRONTEND noninteractive
55
ENV HOME /root
66

7+
# built-in packages
78
RUN apt-get update \
8-
&& apt-get install -y --force-yes --no-install-recommends supervisor \
9+
&& apt-get install -y --force-yes --no-install-recommends software-properties-common \
10+
&& add-apt-repository ppa:fcwu-tw/ppa \
11+
&& apt-get update \
12+
&& apt-get install -y --force-yes --no-install-recommends \
13+
supervisor \
914
openssh-server pwgen sudo vim-tiny \
1015
net-tools \
1116
lxde x11vnc xvfb \
@@ -20,12 +25,13 @@ RUN apt-get update \
2025
&& apt-get autoremove \
2126
&& rm -rf /var/lib/apt/lists/*
2227

23-
ADD https://dl.dropboxusercontent.com/u/23905041/x11vnc_0.9.14-1.1ubuntu1_amd64.deb /tmp/
24-
ADD https://dl.dropboxusercontent.com/u/23905041/x11vnc-data_0.9.14-1.1ubuntu1_all.deb /tmp/
25-
RUN dpkg -i /tmp/x11vnc*.deb
26-
2728
ADD web /web/
28-
RUN pip install -r /web/requirements.txt
29+
RUN pip install setuptools wheel && pip install -r /web/requirements.txt
30+
31+
# tini for subreap
32+
ENV TINI_VERSION v0.9.0
33+
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini
34+
RUN chmod +x /bin/tini
2935

3036
ADD noVNC /noVNC/
3137
ADD nginx.conf /etc/nginx/sites-enabled/default

startup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ sudo -u ubuntu -i bash -c "mkdir -p /home/ubuntu/.config/pcmanfm/LXDE/ \
1313

1414
cd /web && ./run.py > /var/log/web.log 2>&1 &
1515
nginx -c /etc/nginx/nginx.conf
16-
exec /usr/bin/supervisord -n
16+
exec /bin/tini -- /usr/bin/supervisord -n

0 commit comments

Comments
 (0)