File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -4,8 +4,13 @@ MAINTAINER Doro Wu <fcwu.tw@gmail.com>
4
4
ENV DEBIAN_FRONTEND noninteractive
5
5
ENV HOME /root
6
6
7
+ # built-in packages
7
8
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 \
9
14
openssh-server pwgen sudo vim-tiny \
10
15
net-tools \
11
16
lxde x11vnc xvfb \
@@ -20,12 +25,13 @@ RUN apt-get update \
20
25
&& apt-get autoremove \
21
26
&& rm -rf /var/lib/apt/lists/*
22
27
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
-
27
28
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
29
35
30
36
ADD noVNC /noVNC/
31
37
ADD nginx.conf /etc/nginx/sites-enabled/default
Original file line number Diff line number Diff line change @@ -13,4 +13,4 @@ sudo -u ubuntu -i bash -c "mkdir -p /home/ubuntu/.config/pcmanfm/LXDE/ \
13
13
14
14
cd /web && ./run.py > /var/log/web.log 2>&1 &
15
15
nginx -c /etc/nginx/nginx.conf
16
- exec /usr/bin/supervisord -n
16
+ exec /bin/tini -- / usr/bin/supervisord -n
You can’t perform that action at this time.
0 commit comments