From fd0f6f3151fd89d1b41eca089c1a01ab875a41cd Mon Sep 17 00:00:00 2001
From: root <root@steel.local>
Date: Sat, 9 Jan 2016 04:26:21 +0300
Subject: [PATCH] version 1.1.5

---
 CHANGELOG.md | 12 ++++++++++++
 Dockerfile   | 21 ++++++++++++++++++---
 Makefile     |  2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5b2691..5b805ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v 1.1.5
+Ability to set password for users from shell by calling
+
+```shell
+
+	$ gossha passwd user password
+	$ gossha root user password	
+
+```
+	
+Many typos fixed. Dockerfile provided.
+
 # v 1.1.4
 Use other library to conceal password input for creating users
 Newer dependencies. Small fixes.
diff --git a/Dockerfile b/Dockerfile
index 96d69b3..0629be9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Official docker file for building HuntJS powered applications
+# Official docker file for building Gossha server
 #
 
 FROM fedora:23
@@ -14,6 +14,23 @@ RUN dnf clean all
 ENV GOSSHA_PORT=22
 EXPOSE 22
 
+# Set one of possible database storages. We can use only one method
+
+# Set database connection string for MySQL database
+#ENV GOSSHA_DRIVER=mysql 
+#ENV GOSSHA_CONNECTIONSTRING=user:password@localhost/dbname?charset=utf8&parseTime=True&loc=Local
+
+# Set database connection string for PostgreSQL database
+#ENV GOSSHA_DRIVER=postgres 
+#ENV GOSSHA_CONNECTIONSTRING='user=gorm dbname=gorm sslmode=disable'
+#ENV GOSSHA_CONNECTIONSTRING='postgres://pqgotest:password@localhost/pqgotest?sslmode=verify-full'
+
+# Set database connection string for SQLite database
+ENV GOSSHA_DRIVER=sqlite3
+#ENV GOSSHA_CONNECTIONSTRING=':memory:'
+ENV GOSSHA_CONNECTIONSTRING=/root/.gossha/gossha.db
+
+
 # Create home directory
 ENV GOSSHA_HOMEDIR=/root/.gossha
 
@@ -31,8 +48,6 @@ RUN /usr/bin/gossha passwd user2 user2
 
 # Inject SSHD server keys
 ADD build/id_rsa /root/.ssh/
-
-# Inject SSHD server keys
 ADD build/id_rsa.pub /root/.ssh/
 
 # Run the image process. Point second argument to your entry point of application
diff --git a/Makefile b/Makefile
index b9fe3b8..da20944 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-export semver=1.1.4
+export semver=1.1.5
 export arch=$(shell uname)-$(shell uname -m)
 export gittip=$(shell git log --format='%h' -n 1)
 export ver=$(semver).$(gittip).$(arch)