From 18cdf60aaeb4bbb8a76aa4d22629f6ff7f527a7b Mon Sep 17 00:00:00 2001 From: Kai Hendry Date: Sat, 6 Dec 2014 21:22:12 +0800 Subject: [PATCH] Addressing issues in http://dabase.com/blog/Docker_container_update_workflow/ --- Dockerfile | 9 +++------ README.md | 3 ++- .../bootstrap}/css/bootstrap-theme.css | 0 .../bootstrap}/css/bootstrap-theme.css.map | 0 .../bootstrap}/css/bootstrap-theme.min.css | 0 {bootstrap => www/bootstrap}/css/bootstrap.css | 0 {bootstrap => www/bootstrap}/css/bootstrap.css.map | 0 {bootstrap => www/bootstrap}/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin {bootstrap => www/bootstrap}/js/bootstrap.js | 0 {bootstrap => www/bootstrap}/js/bootstrap.min.js | 0 create.php => www/create.php | 0 grep.php => www/grep.php | 0 greptweet.appcache => www/greptweet.appcache | 0 {icons => www/icons}/120x120.png | Bin {icons => www/icons}/greptweet_birdie.png | Bin {icons => www/icons}/greptweet_birdie.svg | 0 index.html => www/index.html | 0 index.php => www/index.php | 0 jquery.js => www/jquery.js | 0 json-to-text.php => www/json-to-text.php | 0 main.js => www/main.js | 0 oauth.php => www/oauth.php | 0 26 files changed, 5 insertions(+), 7 deletions(-) rename {bootstrap => www/bootstrap}/css/bootstrap-theme.css (100%) rename {bootstrap => www/bootstrap}/css/bootstrap-theme.css.map (100%) rename {bootstrap => www/bootstrap}/css/bootstrap-theme.min.css (100%) rename {bootstrap => www/bootstrap}/css/bootstrap.css (100%) rename {bootstrap => www/bootstrap}/css/bootstrap.css.map (100%) rename {bootstrap => www/bootstrap}/css/bootstrap.min.css (100%) rename {bootstrap => www/bootstrap}/fonts/glyphicons-halflings-regular.eot (100%) rename {bootstrap => www/bootstrap}/fonts/glyphicons-halflings-regular.svg (100%) rename {bootstrap => www/bootstrap}/fonts/glyphicons-halflings-regular.ttf (100%) rename {bootstrap => www/bootstrap}/fonts/glyphicons-halflings-regular.woff (100%) rename {bootstrap => www/bootstrap}/js/bootstrap.js (100%) rename {bootstrap => www/bootstrap}/js/bootstrap.min.js (100%) rename create.php => www/create.php (100%) rename grep.php => www/grep.php (100%) rename greptweet.appcache => www/greptweet.appcache (100%) rename {icons => www/icons}/120x120.png (100%) rename {icons => www/icons}/greptweet_birdie.png (100%) rename {icons => www/icons}/greptweet_birdie.svg (100%) rename index.html => www/index.html (100%) rename index.php => www/index.php (100%) rename jquery.js => www/jquery.js (100%) rename json-to-text.php => www/json-to-text.php (100%) rename main.js => www/main.js (100%) rename oauth.php => www/oauth.php (100%) diff --git a/Dockerfile b/Dockerfile index c9fd820..3688348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,14 @@ FROM base/archlinux:latest MAINTAINER Kai Hendry -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/ diff --git a/README.md b/README.md index 3254a18..a0c0d74 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,5 @@ Save that SECRETEXAMPLESTRING to secret.php: # Setting up the hosting environment - +* +* diff --git a/bootstrap/css/bootstrap-theme.css b/www/bootstrap/css/bootstrap-theme.css similarity index 100% rename from bootstrap/css/bootstrap-theme.css rename to www/bootstrap/css/bootstrap-theme.css diff --git a/bootstrap/css/bootstrap-theme.css.map b/www/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from bootstrap/css/bootstrap-theme.css.map rename to www/bootstrap/css/bootstrap-theme.css.map diff --git a/bootstrap/css/bootstrap-theme.min.css b/www/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from bootstrap/css/bootstrap-theme.min.css rename to www/bootstrap/css/bootstrap-theme.min.css diff --git a/bootstrap/css/bootstrap.css b/www/bootstrap/css/bootstrap.css similarity index 100% rename from bootstrap/css/bootstrap.css rename to www/bootstrap/css/bootstrap.css diff --git a/bootstrap/css/bootstrap.css.map b/www/bootstrap/css/bootstrap.css.map similarity index 100% rename from bootstrap/css/bootstrap.css.map rename to www/bootstrap/css/bootstrap.css.map diff --git a/bootstrap/css/bootstrap.min.css b/www/bootstrap/css/bootstrap.min.css similarity index 100% rename from bootstrap/css/bootstrap.min.css rename to www/bootstrap/css/bootstrap.min.css diff --git a/bootstrap/fonts/glyphicons-halflings-regular.eot b/www/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from bootstrap/fonts/glyphicons-halflings-regular.eot rename to www/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/bootstrap/fonts/glyphicons-halflings-regular.svg b/www/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from bootstrap/fonts/glyphicons-halflings-regular.svg rename to www/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/bootstrap/fonts/glyphicons-halflings-regular.ttf b/www/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from bootstrap/fonts/glyphicons-halflings-regular.ttf rename to www/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/bootstrap/fonts/glyphicons-halflings-regular.woff b/www/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from bootstrap/fonts/glyphicons-halflings-regular.woff rename to www/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/bootstrap/js/bootstrap.js b/www/bootstrap/js/bootstrap.js similarity index 100% rename from bootstrap/js/bootstrap.js rename to www/bootstrap/js/bootstrap.js diff --git a/bootstrap/js/bootstrap.min.js b/www/bootstrap/js/bootstrap.min.js similarity index 100% rename from bootstrap/js/bootstrap.min.js rename to www/bootstrap/js/bootstrap.min.js diff --git a/create.php b/www/create.php similarity index 100% rename from create.php rename to www/create.php diff --git a/grep.php b/www/grep.php similarity index 100% rename from grep.php rename to www/grep.php diff --git a/greptweet.appcache b/www/greptweet.appcache similarity index 100% rename from greptweet.appcache rename to www/greptweet.appcache diff --git a/icons/120x120.png b/www/icons/120x120.png similarity index 100% rename from icons/120x120.png rename to www/icons/120x120.png diff --git a/icons/greptweet_birdie.png b/www/icons/greptweet_birdie.png similarity index 100% rename from icons/greptweet_birdie.png rename to www/icons/greptweet_birdie.png diff --git a/icons/greptweet_birdie.svg b/www/icons/greptweet_birdie.svg similarity index 100% rename from icons/greptweet_birdie.svg rename to www/icons/greptweet_birdie.svg diff --git a/index.html b/www/index.html similarity index 100% rename from index.html rename to www/index.html diff --git a/index.php b/www/index.php similarity index 100% rename from index.php rename to www/index.php diff --git a/jquery.js b/www/jquery.js similarity index 100% rename from jquery.js rename to www/jquery.js diff --git a/json-to-text.php b/www/json-to-text.php similarity index 100% rename from json-to-text.php rename to www/json-to-text.php diff --git a/main.js b/www/main.js similarity index 100% rename from main.js rename to www/main.js diff --git a/oauth.php b/www/oauth.php similarity index 100% rename from oauth.php rename to www/oauth.php