@@ -66,7 +66,7 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
6666 pip install -U certbot && \
6767 mkdir -p /etc/letsencrypt/webrootauth && \
6868 apk del gcc musl-dev linux-headers libffi-dev augeas-dev python-dev
69-
69+ 7070ADD conf/supervisord.conf /etc/supervisord.conf
7171
7272# Copy our nginx config
@@ -109,32 +109,22 @@ RUN sed -i \
109109 ln -s /etc/php7/php.ini /etc/php7/conf.d/php.ini && \
110110 find /etc/php7/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s *)#(.*)/1円 ;2円 /g' {} \;
111111
112- # Install/setup Python deps
113- RUN pip install requests
114- 115- # Install WP-CLI
116- RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
117- RUN chmod +x wp-cli.phar
118- RUN sudo mv wp-cli.phar /usr/local/bin/wp
119112
120113# Add Scripts
121114ADD scripts/start.sh /start.sh
122115ADD scripts/pull /usr/bin/pull
123116ADD scripts/push /usr/bin/push
124117ADD scripts/letsencrypt-setup /usr/bin/letsencrypt-setup
125118ADD scripts/letsencrypt-renew /usr/bin/letsencrypt-renew
126- ADD scripts/docker-hook /usr/bin/docker-hook
127- ADD scripts/hook-listener /usr/bin/hook-listener
128- 129- # Setup permissions
130119RUN chmod 755 /usr/bin/pull && chmod 755 /usr/bin/push && chmod 755 /usr/bin/letsencrypt-setup && chmod 755 /usr/bin/letsencrypt-renew && chmod 755 /start.sh
131- RUN chmod +x /usr/bin/docker-hook
132- RUN chmod +x /usr/bin/hook-listener
133120
134121# copy in code
135122ADD src/ /var/www/html/
123+ ADD errors/ /var/www/errors
124+ 125+ VOLUME /var/www/html
136126
137- EXPOSE 443 80 8555
127+ EXPOSE 443 80
138128
139129# CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"]
140- CMD ["/start.sh" ]
130+ CMD ["/start.sh" ]
0 commit comments