This commit is contained in:
Kai Hendry
2014-12-06 21:22:12 +08:00
parent cd1265d3d7
commit 18cdf60aae
26 changed files with 5 additions and 7 deletions

View File

@@ -1,17 +1,14 @@
FROM base/archlinux:latest FROM base/archlinux:latest
MAINTAINER Kai Hendry <hendry@iki.fi> MAINTAINER Kai Hendry <hendry@iki.fi>
RUN pacman -Syu --noconfirm nginx php php-fpm supervisor git RUN pacman -Syu --noconfirm nginx php php-fpm supervisor
# /srv/http used to match with Archlinux's php.ini open_basedir default # /srv/http used to match with Archlinux's php.ini open_basedir default
RUN git clone https://github.com/kaihendry/greptweet.git /srv/http ADD www /srv/http
WORKDIR /srv/http
RUN git describe --always > version.txt
ADD nginx.conf /etc/nginx/nginx.conf ADD nginx.conf /etc/nginx/nginx.conf
ADD php-fpm.ini /etc/supervisor.d/php-fpm.ini ADD php-fpm.ini /etc/supervisor.d/php-fpm.ini
ADD nginx.ini /etc/supervisor.d/nginx.ini ADD nginx.ini /etc/supervisor.d/nginx.ini
ADD secret.php /srv/http/secret.php
# TODO setfacl?
RUN chown -R http:http /srv/http RUN chown -R http:http /srv/http
VOLUME /srv/http/u/ VOLUME /srv/http/u/

View File

@@ -58,4 +58,5 @@ Save that SECRETEXAMPLESTRING to secret.php:
# Setting up the hosting environment # Setting up the hosting environment
<http://dabase.com/blog/Experiencing_CoreOS+Docker/> * <http://dabase.com/blog/Docker_container_update_workflow/>
* <http://dabase.com/blog/Experiencing_CoreOS+Docker/>

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 150 KiB

View File