From 0d538df97e51ac311847d559c7b8a759f98705c5 Mon Sep 17 00:00:00 2001
From: Oly <oliver.marks@influentialsoftware.com>
Date: Mon, 6 Feb 2017 14:10:35 +0000
Subject: [PATCH] add spacing under introduction

---
 .drone.yml                           | 30 +++++++++++++++++++++-------
 mhackspace/templates/pages/home.html |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index fb192f6..ecedc55 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,5 +1,6 @@
 pipeline:
   backend:
+    build: ./compose/django/Dockerfile
     image: maidstonehackspacewebsite_django
     environment:
       - POSTGRES_USER=mhackspace
@@ -7,9 +8,9 @@ pipeline:
       - DJANGO_SETTINGS_MODULE=config.settings.test
     commands:
       - cp -n env.example .env
+      -  pip install -r /requirements/test.txt
       - python manage.py test mhackspace --verbosity 2
 
-  deploy:
 
 
 
@@ -20,6 +21,9 @@ pipeline:
 services:
   postgres:
     build: ./compose/postgres
+#    build:
+#      context: .
+#      dockerfile: ./compose/django/Dockerfile
 #    volumes:
 #      - postgres_data_dev:/var/lib/postgresql/data
 #      - postgres_backup_dev:/backups
@@ -47,10 +51,22 @@ services:
   mailhog:
     image: mailhog/mailhog
 
+# deploy:
+#   ssh:
+#     target: test.maidstone-hackspace.org.uk:/var/www/test-maidstone-hackspace.org.uk 22
+#     artifacts:
+#       - build.result
+#       - config/file
+#     cmd: /opt/bin/redeploy.sh
+
 deploy:
-  ssh:
-    target: test.maidstone-hackspace.org.uk:/var/www/test-maidstone-hackspace.org.uk 22
-    artifacts:
-      - build.result
-      - config/file
-    cmd: /opt/bin/redeploy.sh
+    ssh:
+        host: maidstone-hackspace-stage
+        port: 22
+        commands:
+            - cd /var/www/stage/maidstone-hackspace-website/
+            - docker-compose -fstage.yml build
+            - docker-compose -fstage.yml down --remove-orphans
+            - docker-compose -fstage.yml up
+    when:
+        branch: master
diff --git a/mhackspace/templates/pages/home.html b/mhackspace/templates/pages/home.html
index 9dea5f0..19b8e5b 100644
--- a/mhackspace/templates/pages/home.html
+++ b/mhackspace/templates/pages/home.html
@@ -3,7 +3,7 @@
 
 {% block content %}
   <h2>Introduction</h2>
-  Hackspaces are a shared space where artists, designers, makers, hackers, programmers, tinkerers, professionals and hobbyists can work on their projects, share knowledge and collaborate.We are in the process of developing Maidstone Hackspace. We're previous members of (ICMP) and looking to form a new space in the future. At the moment, communication is via google groups, email, and the website. If you're at all intrested please join our mailing list and make yourself known!
+  <p>Hackspaces are a shared space where artists, designers, makers, hackers, programmers, tinkerers, professionals and hobbyists can work on their projects, share knowledge and collaborate.We are in the process of developing Maidstone Hackspace. We're previous members of (ICMP) and looking to form a new space in the future. At the moment, communication is via google groups, email, and the website. If you're at all intrested please join our mailing list and make yourself known!</p>
 
   {% show_feeds %}
 {% endblock content %}