Add Dockerfiles from Dwd's repo

.gitignore

@@ -15,5 +15,4 @@
 output/
 bower_components
 node_modules
-build/
 content/extensions

MakefileDocker

@@ -0,0 +1,23 @@
+#
+# Build a docker image to build the website,
+# then build a docker image to serve it.
+#
+# The website source must be checked out
+# locally as ./xmpp.org (which'll happen
+# automatically with git submodules).
+#
+
+all: deployer
+
+deployer: site
+	docker build -t xmpp-org/latest deploy
+
+builder:
+	docker build -t xmpp-org-build/latest build
+
+site: builder
+	docker run --env COMMIT_HASH=${COMMIT_HASH} --volume $(CURDIR):/var/tmp/src/xmpp.org --volume $(CURDIR)/deploy/output:/var/tmp/output -t -i xmpp-org-build/latest
+
+serve:
+	docker run -p 8080:80 -t -i xmpp-org/latest
+

README.md

@@ -64,6 +64,22 @@ make devserver
 
 View at `http://localhost:8000`
 
+### Docker-based installation
+
+The Makefile will build the website completely just by `make`. It'll do
+the following:
+
+* Create a build Docker image (`make builder`) which is a development
+environment with a complete set of dependencies ready.
+
+* Run this docker image on the xmpp.org directory locally. This directory
+is presumed to contain a checked out repository for the website. (`make site`)
+
+* From the newly created static files in `deploy/output`, it will then create
+a minimalist docker image to actually serve the website. (`make deployer`)
+
+For development convenience, you can run the website on port 8080 by `make serve`
+
 ### Vagrant-based installation
 For your convenience, this repository ships with a basic Vagrantfile, which allows you to create virtual machine with all the dependencies required for local development.
 

build/Dockerfile

@@ -0,0 +1,28 @@
+# Dockerfile to build a XSF website devenv
+#
+# Dave Cridland <dave.cridland@surevine.com>
+# Copyright 2017 Surevine Ltd
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+FROM debian:7.10
+MAINTAINER Dave Cridland <dave.cridland@surevine.com>
+
+# Set environment variables
+ENV DEBIAN_FRONTEND noninteractive
+
+# Update system
+RUN apt-get update && apt-get dist-upgrade -y && apt-get autoremove -y && apt-get clean
+
+# Install dependencies.
+RUN apt-get install -y python-pip git && pip install pelican==3.3 markdown ghp-import
+
+VOLUME /var/tmp/output
+VOLUME /var/tmp/src/xmpp.org
+
+CMD cd /var/tmp/src/xmpp.org && make publish && make html && cp -prv output/* /var/tmp/output/

deploy/Dockerfile

@@ -0,0 +1,32 @@
+# Dockerfile to build a docker image from Openfire Master
+#
+# Dave Cridland <dave.cridland@surevine.com>
+# Copyright 2017 Surevine Ltd
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+FROM debian
+MAINTAINER Dave Cridland <dave.cridland@surevine.com>
+
+# Set environment variables
+ENV DEBIAN_FRONTEND noninteractive
+
+# Update system
+RUN apt-get update && apt-get dist-upgrade -y && apt-get autoremove -y && apt-get clean
+
+# Install dependencies.
+RUN apt-get install -y nginx
+
+# Copy site
+WORKDIR /var/www/html/
+COPY output/ /var/www/html/
+COPY xsf.conf /etc/nginx/sites-available/default
+
+EXPOSE 80
+
+CMD /usr/sbin/nginx -g 'daemon off;'

deploy/xsf.conf

@@ -0,0 +1,84 @@
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+# http://wiki.nginx.org/Pitfalls
+# http://wiki.nginx.org/QuickStart
+# http://wiki.nginx.org/Configuration
+#
+# Generally, you will want to move this file somewhere, and start with a clean
+# file but keep this around for reference. Or just disable in sites-enabled.
+#
+# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
+##
+
+# Default server configuration
+#
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server;
+
+	# SSL configuration
+	#
+	# listen 443 ssl default_server;
+	# listen [::]:443 ssl default_server;
+	#
+	# Self signed certs generated by the ssl-cert package
+	# Don't use them in a production server!
+	#
+	# include snippets/snakeoil.conf;
+
+	root /var/www/html;
+
+	# Add index.php to the list if you are using PHP
+	index index.html index.htm index.nginx-debian.html;
+
+	server_name _;
+
+	location / {
+		# First attempt to serve request as file, then
+		# as directory, then fall back to displaying a 404.
+		try_files $uri $uri/ $uri.html =404;
+	}
+
+	#location ~ \.html$ {
+	#	rewrite ^(.+)\.html$ $scheme://$host$1 redirect;
+	#}
+
+	# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+	#
+	#location ~ \.php$ {
+	#	include snippets/fastcgi-php.conf;
+	#
+	#	# With php5-cgi alone:
+	#	fastcgi_pass 127.0.0.1:9000;
+	#	# With php5-fpm:
+	#	fastcgi_pass unix:/var/run/php5-fpm.sock;
+	#}
+
+	# deny access to .htaccess files, if Apache's document root
+	# concurs with nginx's one
+	#
+	#location ~ /\.ht {
+	#	deny all;
+	#}
+}
+
+
+# Virtual Host configuration for example.com
+#
+# You can move that to a different file under sites-available/ and symlink that
+# to sites-enabled/ to enable it.
+#
+#server {
+#	listen 80;
+#	listen [::]:80;
+#
+#	server_name example.com;
+#
+#	root /var/www/example.com;
+#	index index.html;
+#
+#	location / {
+#		try_files $uri $uri/ =404;
+#	}
+#}