Add Heroku button

mb-0 · Jan 2, 2017 · e78bbda · e78bbda
1 parent 83608c0
commit e78bbda
Show file tree

Hide file tree

Showing 7 changed files with 1,586 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -21,8 +21,6 @@ Dockerfile export-ignore
 **/README.* export-ignore
 
 # composer files
-composer.json export-ignore
-composer.lock export-ignore
 vendor/composer/installed.json export-ignore
 
 # binaries

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ Thumbs.db
 .*.swp
 *~
 *.lock
+!composer.lock
 .idea
 .buildpath
 .project

diff --git a/README.markdown b/README.markdown
@@ -3,6 +3,8 @@ Miniflux - Minimalist News Reader
 
 [![Build Status](https://travis-ci.org/miniflux/miniflux.svg?branch=master)](https://travis-ci.org/miniflux/miniflux)
 
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/miniflux/miniflux/tree/master)
+
 Miniflux is a minimalist and web-based RSS reader.
 
 Features

diff --git a/app.json b/app.json
@@ -0,0 +1,8 @@
+{
+  "name": "Miniflux",
+  "description": "Minimalist RSS Reader",
+  "repository": "https://github.com/miniflux/miniflux",
+  "logo": "https://raw.githubusercontent.com/miniflux/miniflux/master/assets/img/touch-icon-ipad-retina.png",
+  "keywords": ["rss", "feed", "atom", "minimalist", "miniflux"],
+  "addons": ["heroku-postgresql:hobby-dev"]
+}
diff --git a/app/common.php b/app/common.php
@@ -2,6 +2,19 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
+$dbUrlParser = new PicoDb\UrlParser();
+
+if ($dbUrlParser->isEnvironmentVariableDefined()) {
+    $dbSettings = $dbUrlParser->getSettings();
+
+    define('DB_DRIVER', $dbSettings['driver']);
+    define('DB_USERNAME', $dbSettings['username']);
+    define('DB_PASSWORD', $dbSettings['password']);
+    define('DB_HOSTNAME', $dbSettings['hostname']);
+    define('DB_PORT', $dbSettings['port']);
+    define('DB_NAME', $dbSettings['database']);
+}
+
 if (file_exists(__DIR__.'/../config.php')) {
     require __DIR__.'/../config.php';
 }

diff --git a/composer.json b/composer.json
@@ -12,6 +12,8 @@
         "optimize-autoloader": true
     },
     "require": {
+        "php" : ">=5.3.3",
+        "ext-mbstring" : "*",
         "fguillot/simple-validator": "v1.0.0",
         "fguillot/json-rpc": "v1.2.3",
         "fguillot/picodb": "v1.0.14 ",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ Thumbs.db @@
     .*.swp
     *~
     *.lock
+    !composer.lock
     .idea
     .buildpath
     .project
@@ Expand Down @@