From 6d10c92803965555800c7a1d472141f2d912c16b Mon Sep 17 00:00:00 2001
From: David Young <davidy@funkypenguin.co.nz>
Date: Sat, 29 Jul 2017 20:53:06 +1200
Subject: [PATCH] Update CI workflow for rsync vs S3

---
 .gitlab-ci.yml                              | 15 ++++++++++++---
 docs/ha-docker-swarm/shared-storage-ceph.md |  9 ++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b058ce6..ced9e18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,15 +22,24 @@ test site:
     - echo fake result as a placeholder
 
 deploy dev:
-  image: garland/docker-s3cmd
+#  image: garland/docker-s3cmd
+  image: alpine
   stage: deploy
-  environment: production
+  environment: development
   except:
   - master
   script:
+    - apk add rsync openssh --no-cache
     - export LC_ALL=C.UTF-8
     - export LANG=C.UTF-8
-    - s3cmd --no-mime-magic --access_key=$ACCESS_KEY --secret_key=$SECRET_KEY --acl-public --delete-removed --delete-after --no-ssl --host=$S3HOST --host-bucket='$S3HOSTBUCKET' sync public s3://geeks-cookbook-dev
+    - mkdir .ssh
+    - chmod 700 .ssh
+    - echo $SSHKEY > .ssh/id_rsa
+    - chmod 600 .ssh/id_rsa
+    - rsync -avr public $SSHUSER@$SSHHOST:$SSHPATH/geeks-cookbook-dev
+#    - export LC_ALL=C.UTF-8
+#    - export LANG=C.UTF-8
+#    - s3cmd --no-mime-magic --access_key=$ACCESS_KEY --secret_key=$SECRET_KEY --acl-public --delete-removed --delete-after --no-ssl --host=$S3HOST --host-bucket='$S3HOSTBUCKET' sync public s3://geeks-cookbook-dev
 
 deploy prod:
   image: garland/docker-s3cmd
diff --git a/docs/ha-docker-swarm/shared-storage-ceph.md b/docs/ha-docker-swarm/shared-storage-ceph.md
index 192a90a..e2fde14 100644
--- a/docs/ha-docker-swarm/shared-storage-ceph.md
+++ b/docs/ha-docker-swarm/shared-storage-ceph.md
@@ -53,7 +53,7 @@ docker run -d --net=host \
 ceph/daemon mon
 ```
 
-Now **copy** the contents of /etc/ceph on this first node to the remaining nodes, and **then** run the docker command above on each remaining node. You'll end up with a cluster with 3 monitors (odd number is required for quorum, same as Docker Swarm), and no OSDs (yet)
+Now **copy** the contents of /etc/ceph on this first node to the remaining nodes, and **then** run the docker command above (_customizing MON_IP as you go_) on each remaining node. You'll end up with a cluster with 3 monitors (odd number is required for quorum, same as Docker Swarm), and no OSDs (yet)
 
 
 ### Setup OSDs
@@ -162,6 +162,13 @@ name=dockerswarm\
 0 2" >> /etc/fstab
 mount -a
 ```
+### Install docker-volume plugin
+
+Upstream bug for docker-latest reported at https://bugs.centos.org/view.php?id=13609
+
+And the alpine fault:
+https://github.com/gliderlabs/docker-alpine/issues/317
+
 
 ## Serving