From 01bf30b6c69d9c4f1b35cab7a6aefa8d0cc3c774 Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Mon, 4 Apr 2016 18:53:15 +0300
Subject: [PATCH] Add Dockerfile for building Salt Master + Minion image

---
 Dockerfile | 20 ++++++++++++++++++++
 README.rst | 32 +++++++++++++++++++-------------
 2 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c4d7978
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu-upstart:14.04
+MAINTAINER "SaltStack Team"
+
+# Bootstrap script options: install Salt Master by default
+ENV BOOTSTRAP_OPTS='-M'
+# Version of salt to install: stable or git
+ENV SALT_VERSION=stable
+
+ADD bootstrap-salt.sh /tmp/
+
+# Prevent udev from being upgraded inside the container, dpkg will fail to configure it
+RUN echo udev hold | dpkg --set-selections
+# Upgrade System and Install Salt
+RUN sudo sh /tmp/bootstrap-salt.sh -U -X -d $BOOTSTRAP_OPTS $SALT_VERSION && \
+    apt-get clean
+RUN /usr/sbin/update-rc.d -f ondemand remove; \
+    update-rc.d salt-minion defaults && \
+    update-rc.d salt-master defaults || true
+
+EXPOSE 4505 4506
diff --git a/README.rst b/README.rst
index 26f925f..a94d650 100644
--- a/README.rst
+++ b/README.rst
@@ -25,7 +25,7 @@ are high that your issue was already fixed.
 Bootstrap
 =========
 
-If you're looking for the *one-liner* to install salt, please scroll to the bottom and use the
+If you're looking for the *one-liner* to install Salt, please scroll to the bottom and use the
 instructions for `Installing via an Insecure One-Liner`_.
 
 .. note::
@@ -37,6 +37,9 @@ instructions for `Installing via an Insecure One-Liner`_.
 Examples
 --------
 
+The Salt Bootstrap script has a wide variety of options that can be passed as
+well as several ways of obtaining the bootstrap script itself.
+
 .. note::
 
   These examples below show how to bootstrap Salt directly from GitHub or other Git repository.
@@ -61,7 +64,7 @@ If you want to install a specific release version (based on the Git tags):
 .. code:: console
 
   curl -o bootstrap_salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh git v2015.8.7
+  sudo sh bootstrap_salt.sh git v2015.8.8
 
 To install a specific branch from a Git fork:
 
@@ -96,7 +99,7 @@ Using ``wget`` to install your distribution's stable packages:
   wget -O bootstrap_salt.sh https://bootstrap.saltstack.com
   sudo sh bootstrap_salt.sh
 
-Install a specific version from git using ``wget``:
+Installing a specific version from git using ``wget``:
 
 .. code:: console
 
@@ -119,7 +122,7 @@ If you already have Python installed, ``python 2.6``, then it's as easy as:
   python -m urllib "https://bootstrap.saltstack.com" > bootstrap_salt.sh
   sudo sh bootstrap_salt.sh git develop
 
-All Python versions should support the following one liner:
+All Python versions should support the following in-line code:
 
 .. code:: console
 
@@ -142,7 +145,7 @@ If you have any SSL issues install ``ca_root_nssp``:
 
 .. code:: console
 
-   pkg install ca_root_nssp
+ pkg install ca_root_nssp
 
 And either copy the certificates to the place where fetch can find them:
 
@@ -164,20 +167,23 @@ The following examples illustrate how to install Salt via a one-liner.
 
 .. note::
 
-    Warning! These methods do not involve a verification step and assume that the delivered file
-    is trustworthy.
+  Warning! These methods do not involve a verification step and assume that the delivered file
+  is trustworthy.
+
+Any of the example above which use two-lines can be made to run in a single-line
+configuration with minor modifications.
 
 Installing the latest stable release of Salt (default):
 
 .. code:: console
 
-  curl -L https://bootstrap.saltstack.com | sudo sh -s -- stable
+  curl -L https://bootstrap.saltstack.com | sudo sh
 
-or
+Using ``wget`` to install your distribution's stable packages:
 
-.. code:: console
+.. code-block:: bash
 
-  curl -L https://bootstrap.saltstack.com | sudo sh -s
+  wget -O - https://bootstrap.saltstack.com | sudo sh
 
 Installing the latest develop branch of Salt:
 
@@ -484,8 +490,8 @@ Ubuntu box. First, install Vagrant, then:
 
 .. code:: console
 
-    vagrant up
-    vagrant ssh
+  vagrant up
+  vagrant ssh
 
 
 .. _Vagrant: http://www.vagrantup.com