From 218d1f593ffa9b175fe52c52af35a20f9d3777c1 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 24 Aug 2018 15:03:23 +1000
Subject: [PATCH] Readme updates, build cache tag change

---
 .gitlab-ci.yml |  4 ++--
 README.md      | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2e7036..c5a1b9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 - build
 
 variables:
-  VERSION: 1.12a39-armv7l
+  VERSION: 1.12a39-${CI_COMMIT_REF_NAME}
   CACHETAG: build
   DOCKER_HOST: tcp://docker:2375
 
@@ -36,7 +36,7 @@ build:
   - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
   - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}-${CI_COMMIT_REF_NAME}
   tags:
   - docker-armv7l
   only:
diff --git a/README.md b/README.md
index fd5a1ba..3e84a21 100644
--- a/README.md
+++ b/README.md
@@ -27,18 +27,21 @@ To use this container:
 
 3. Start the container.
 
-        docker run -itd -v /srv/mystic/data:/mystic data -p 10022:22 -p 10023:23 -p 24554:24554 registry.leenooks.net/leenooks/mysticbbs:1.12a39-armv7l
+        docker run -itd -v /srv/mystic/data:/mystic/data -p 10022:22 -p 10023:23 -p 24554:24554 registry.leenooks.net/leenooks/mysticbbs:1.12a39-armv7l
 
     Explanation of these parameters:
 
     | Parameter | Value |
     | :- | :-- |
     | -d | Detached mode: run the container in the background and print the new container ID. |
-    | -i | Keep STDIN open even if not attached. |
-    | -n | Give your container a specific name. |
-    | -p | Map host ports to container ports. |
-    | -t | Allocate a pseudo-TTY. |
+    | -i | Keep STDIN open even if not attached. (required) |
+    | -n | Give your container a specific name. (optional) |
+    | -p | Map host ports to container ports. (may be required, otherwise recommended) |
+    | -t | Allocate a pseudo-TTY. (required) |
+    | -v | Map a path on the host into the container (optional but recommended). |
    
+    (There are other useful parameters you can use, like --restart, etc. If you dont pass in a data volume for /mystic/data, docker will create one and preserve it if you start subsequent containers a specific way (beyond the scope of this README - so its recommended you do this in first instance anyway.)
+
     Remember your container ID *(your number will be different)*. 
 
         ca219a461376...
@@ -56,3 +59,5 @@ To use this container:
 If you want to monitor your container, or stop it, attach to the console with:
       
     docker attach ca219a461376
+
+You can also run this in a swarm (I do)!