Merge pull request #13 from jvanbaarsen/prepare-new-release

Prepare new release
intercity · May 27, 2016 · 4261881 · 4261881
2 parents 7dd4e32 + fce5776
commit 4261881
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,21 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
-- Remove SECRET_KEY_BASE since it has been moved to intercity-next repo (jvanbaarsen)
-- Symlink the Intercity Backup directory (See https://github.com/intercity/intercity-next/pull/42)
-- FROM_EMAIL env var, used for all the emails send out by IC.
-- Install Sendmail
-- Added SMTP configuration options
-- Log sidekiq output to $app/log/sidekiq.log
-- Sidekiq config has been moved to the intercity/intercity-next repo. (see https://github.com/intercity/intercity-next/pull/63)
-- Bumped the Docker image version in the launcher
+## [0.3.0] - 2016-05-27
+* Symlink the Intercity Backup directory (See https://github.com/intercity/intercity-next/pull/42)
+* FROM_EMAIL env var, used for all the emails send out by IC.
+* Added SMTP configuration options
+* Log sidekiq output to $app/log/sidekiq.log
+* Sidekiq config has been moved to the intercity/intercity-next repo. (see https://github.com/intercity/intercity-next/pull/63)
+* Bumped the Docker image version in the launcher
+* Add proper licensing (jvanbaarsen)
+* Remove SECRET_KEY_BASE since it has been moved to intercity-next repo (jvanbaarsen)
 
 ## [0.2.0] - 2016-01-04
-- Updated to ruby 2.3
+* Updated to ruby 2.3
 
 ## [0.1.0] - 2015-12-19
-- Initial release
+* Initial release
 
-[Unreleased]: https://github.com/intercity/intercity-docker/compare/v0.2.0...HEAD
-[0.2.0]: https://github.com/intercity/intercity-docker/compare/v0.1.0-beta...v0.2.0
diff --git a/README.md b/README.md
@@ -6,12 +6,9 @@ This is still in heavy development, do **not** run in production
 
 ## Get started
 
-1. Clone this repository to your server
-1. Go to the intercity folder: `cd /var/intercity`
-1. Copy the sample container config: `cp samples/app.yml containers/`
-1. Run `./launcher bootstrap app`
-1. Start Intercity with `./launcher start app`
-1. Go to the IP of your server in a browser, and see Intercity running!
+
+For installation instructions, please see our [install manual][install]
+
 
 ## Credits
 
@@ -20,4 +17,13 @@ This docker system is heavily inspired (And parts are copied) from the
 
 ## License
 
-MIT
+The MIT License (MIT)
+Copyright (c) 2016 Firmhouse B.V.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[install]: https://gitlab.com/intercity/intercity-next/blob/master/doc/installation.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.0-pre
+0.3.0
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -1,17 +1,17 @@
 # NAME:     intercity_base
-# VERSION:  0.2.1
+# VERSION:  0.3.0
 
 FROM ubuntu:14.04
 
 MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"
 
-RUN echo "0.2.1" > /VERSION
+RUN echo "0.3.0" > /VERSION
 
 # Install dependencies
 RUN apt-get -y upgrade &&\
+    apt-get -y update &&\
     apt-get -y install software-properties-common &&\
     add-apt-repository -y ppa:rwky/redis &&\
-    apt-get -y update &&\
     apt-get -y install build-essential git curl wget \
       libxslt-dev libcurl4-openssl-dev \
       libssl-dev libyaml-dev libtool \

diff --git a/images/build.rb b/images/build.rb
@@ -1,6 +1,6 @@
 require 'pty'
 
-$version = "0.2.1"
+$version = "0.3.0"
 
 $base_image = "intercity/base:#{$version}"
 $image = "intercity/intercity:#{$version}"

diff --git a/images/intercity/Dockerfile b/images/intercity/Dockerfile
@@ -1,4 +1,4 @@
-FROM intercity/base:0.2.1
+FROM intercity/base:0.3.0
 
 MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"
 

diff --git a/images/intercity/id_rsa.pub b/images/intercity/id_rsa.pub
diff --git a/launcher b/launcher
@@ -2,7 +2,7 @@
 
 app_name=intercity
 app_path="/var/$app_name"
-image=intercity/intercity:0.2.1
+image=intercity/intercity:0.3.0
 
 command=$1
 config=$2