Merge branch 'dev'

.gitignore

@@ -38,3 +38,5 @@ nosetests.xml
 
 # Custom
 *.swp
+venv/
+.DS_Store

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "simiki/themes/simple"]
+	path = simiki/themes/simple
+	url = https://github.com/simiki-org/simple
+[submodule "simiki/themes/simple2"]
+	path = simiki/themes/simple2
+	url = https://github.com/simiki-org/simple2

README.md

@@ -76,6 +76,13 @@ Sending pull requests on [Pull Requests Page](https://github.com/tankywoo/simiki
 * Bug fixes can be based on **`master`** branch and I will also merge into `dev` branch.
 * Feature can be based on **`dev`** branch.
 
+The basic steps are:
+
+	git clone <your-forked-git-repo-url>
+	# clone themes from another repos, otherwise some unittest rely on theme will cause error
+	git submodule init
+	git submodule update
+
 Following links are the contribution guidelines you may need:
 
 * [Fork A Repo](https://help.github.com/articles/fork-a-repo/)

simiki/cli.py

@@ -360,7 +360,7 @@ def copy_attach(self):
         """Copy attach directory under root path to destination directory"""
         src_p = os.path.join(self.target_path, self.config['attach'])
         dest_p = os.path.join(self.target_path, self.config["destination"],
-                              self.config['attach'])
+                              'attach')
         if os.path.exists(src_p):
             copytree(src_p, dest_p)
 

simiki/conf_templates/Dockerfile

@@ -0,0 +1,11 @@
+FROM python:2.7.11
+
+WORKDIR /src
+
+COPY . /src
+RUN pip install simiki
+RUN simiki g
+
+CMD ["simiki", "p", "-w", "--host", "0.0.0.0", "--port", "8000"]
+
+EXPOSE 8000

simiki/initiator.py

@@ -16,6 +16,7 @@ class Initiator(object):
     config_fn = "_config.yml"
     fabfile_fn = "fabfile.py"
     demo_fn = "gettingstarted.md"
+    dockerfile_fn = "Dockerfile"
 
     def __init__(self, config_file, target_path):
         self.config_file = config_file
@@ -51,6 +52,15 @@ def get_fabfile(self):
         dst_fabfile = os.path.join(self.target_path, self.fabfile_fn)
         self.get_file(src_fabfile, dst_fabfile)
 
+    def get_dockerfile(self):
+        src_dockerfile = os.path.join(
+            self.source_path,
+            self.conf_template_dn,
+            self.dockerfile_fn
+        )
+        dst_dockerfile = os.path.join(self.target_path, self.dockerfile_fn)
+        self.get_file(src_dockerfile, dst_dockerfile)
+
     def get_demo_page(self):
         nohidden_dir = listdir_nohidden(
             os.path.join(self.target_path, self.config['source']))
@@ -89,6 +99,7 @@ def init(self):
                 logging.info("Creating directory: {0}".format(path))
 
         self.get_config_file()
+        self.get_dockerfile()
         self.get_fabfile()
         self.get_demo_page()
         self.get_default_theme(theme_path)