Skip to content

Commit

Permalink
replace entrypoint.sh with supervisor
Browse files Browse the repository at this point in the history
  • Loading branch information
BananaWanted authored and BananaWanted committed Feb 12, 2017
1 parent 15b285c commit c94a266
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
16 changes: 10 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ ARG INSTALL_PACKAGES="\
apt-transport-https \
ca-certificates \
software-properties-common \
supervisor \
supervisor-doc \
launchtool \
"
ARG TERM=xterm-256color
VOLUME /shared
WORKDIR /root
EXPOSE 22 80 8080 1080 8000

COPY ./sources.list /etc/apt/sources.list
COPY ./dircolors /root/.dircolors
COPY ./authorized_keys /root/.ssh/authorized_keys
COPY sources.list /etc/apt/sources.list
COPY dircolors /root/.dircolors
COPY authorized_keys /root/.ssh/authorized_keys

RUN apt-get update && \
apt-get install -y --no-install-recommends apt-utils && \
Expand All @@ -44,7 +48,7 @@ RUN apt-get update && \
dircolors -b ~/.dircolors >> ~/.zshrc && \
chsh -s /bin/zsh

COPY ./robbyrussell.zsh-theme /root/.oh-my-zsh/themes/robbyrussell.zsh-theme
COPY ./entrypoint.sh /root/.entrypoint.sh
COPY robbyrussell.zsh-theme /root/.oh-my-zsh/themes/robbyrussell.zsh-theme
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf

ENTRYPOINT ["/root/.entrypoint.sh"]
ENTRYPOINT ["/usr/bin/supervisord"]
10 changes: 0 additions & 10 deletions entrypoint.sh

This file was deleted.

11 changes: 11 additions & 0 deletions supervisord.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[supervisord]
nodaemon=true

[program:sshd]
command=/usr/sbin/sshd -D

;[program:apache2]
;command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"

[program:docker]
command=/usr/bin/dockerd -p /var/run/docker.pid

0 comments on commit c94a266

Please sign in to comment.