Merge pull request #449 from jdeathe/centos-7-develop

Release changes for 2.1.5

CHANGELOG.md

@@ -4,6 +4,20 @@
 
 Summary of release changes for Version 2 - CentOS-7
 
+### 2.1.5 - 2016-12-15
+
+- Adds updated `sudo`, `openssh`, `yum-plugin-versionlock` and `xz` packages.
+- Adds functional tests using [shpec](https://github.com/rylnd/shpec). To run all tests, [install `shpec`](https://github.com/rylnd/shpec#installation) and run with `make test`.
+- Adds support for running tests on Ubuntu. _Note: May require some additional setup prevent warnings about locale._
+
+  ```
+  sudo locale-gen en_US.UTF-8; sudo dpkg-reconfigure locales
+  export LANG=en_US.UTF-8; unset LANGUAGE LC_ALL LC_CTYPE
+  ```
+- Adds correction to examples and test usage of the `sftp` command.
+- Adds a "better practices" example of password hash generation in the `README.md`.
+- Adds minor code style changes to the `Makefile`.
+
 ### 2.1.4 - 2016-12-04
 
 - Adds correct Makefile usage instructions for 'build' target.

Dockerfile

@@ -24,13 +24,13 @@ RUN rpm --rebuilddb \
 		epel-release \
 		https://centos7.iuscommunity.org/ius-release.rpm \
 		vim-minimal-7.4.160-1.el7 \
-		xz-5.1.2-12alpha.el7.x86_64 \
-		sudo-1.8.6p7-17.el7_2 \
-		openssh-6.6.1p1-25.el7_2 \
-		openssh-server-6.6.1p1-25.el7_2 \
-		openssh-clients-6.6.1p1-25.el7_2 \
+		xz-5.2.2-1.el7 \
+		sudo-1.8.6p7-21.el7_3 \
+		openssh-6.6.1p1-31.el7 \
+		openssh-server-6.6.1p1-31.el7 \
+		openssh-clients-6.6.1p1-31.el7 \
 		python-setuptools-0.9.8-4.el7 \
-		yum-plugin-versionlock-1.1.31-34.el7 \
+		yum-plugin-versionlock-1.1.31-40.el7 \
 	&& yum versionlock add \
 		vim-minimal \
 		xz \
@@ -151,7 +151,7 @@ ENV SSH_AUTHORIZED_KEYS="" \
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="2.1.4"
+ARG RELEASE_VERSION="2.1.5"
 LABEL \
 	install="docker run \
 --rm \