Permalink
Browse files

Addressing issues in http://dabase.com/blog/Docker_container_update_w…

  • Loading branch information...
kaihendry committed Dec 6, 2014
1 parent cd1265d commit 18cdf60aaeb4bbb8a76aa4d22629f6ff7f527a7b
View
@@ -1,17 +1,14 @@
FROM base/archlinux:latest
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
-RUN git clone https://github.com/kaihendry/greptweet.git /srv/http
-WORKDIR /srv/http
-RUN git describe --always > version.txt
-
+ADD www /srv/http
ADD nginx.conf /etc/nginx/nginx.conf
ADD php-fpm.ini /etc/supervisor.d/php-fpm.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
VOLUME /srv/http/u/
View
@@ -58,4 +58,5 @@ Save that SECRETEXAMPLESTRING to secret.php:
# 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/>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
File renamed without changes.

0 comments on commit 18cdf60

Please sign in to comment.