Merge branch 'release/0.4.3'

Rudloff · Dec 9, 2015 · cda6b27 · cda6b27
2 parents 3f06b82 + 96aa843
commit cda6b27
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 28 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.gitignore
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,15 @@
+FROM php:apache
+RUN apt-get update
+RUN apt-get install -y libicu-dev xz-utils git zlib1g-dev python npm nodejs-legacy
+RUN docker-php-ext-install mbstring
+RUN docker-php-ext-install intl
+RUN docker-php-ext-install zip
+RUN npm install -g bower grunt-cli
+RUN a2enmod rewrite
+COPY php.ini /usr/local/etc/php/
+COPY . /var/www/html/
+RUN curl -sS https://getcomposer.org/installer | php
+RUN php composer.phar install
+RUN npm install
+RUN bower --allow-root install
+RUN grunt
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -51,7 +51,7 @@ module.exports = function (grunt) {
                     options: {
                         archive: 'alltube-release.zip'
                     },
-                    src: ['*.php', '!config.yml', 'dist/**', 'fonts/**', '.htaccess', 'img/**', 'js/**', 'LICENSE', 'README.md', 'robots.txt', 'sitemap.xml', 'templates/**', 'templates_c/', 'vendor/**', 'classes/**', 'controllers/**', 'bower_components/**']
+                    src: ['*.php', '!config.yml', 'dist/**', 'fonts/**', '.htaccess', 'img/**', 'js/**', 'LICENSE', 'README.md', 'robots.txt', 'sitemap.xml', 'templates/**', 'templates_c/', 'vendor/**', 'classes/**', 'controllers/**', 'bower_components/**', '!vendor/ffmpeg/**', '!vendor/bin/ffmpeg']
                 }
             }
         }

diff --git a/composer.json b/composer.json
@@ -6,15 +6,15 @@
     "type": "project",
     "require": {
         "smarty/smarty": "~3.1",
-        "rg3/youtube-dl": "~2015.11.13",
+        "rg3/youtube-dl": "2015.12.06",
         "slim/slim": "~2.6.2",
         "slim/views": "~0.1.3",
         "rudloff/smarty-plugin-noscheme": "~0.1.0",
-        "symfony/yaml": "~2.7.6",
+        "symfony/yaml": "~3.0.0",
         "ffmpeg/ffmpeg": "~2.8.2"
     },
     "require-dev": {
-        "symfony/var-dumper": "~2.7.6"
+        "symfony/var-dumper": "~3.0.0"
     },
     "extra": {
         "paas": {
@@ -28,11 +28,11 @@
             "type": "package",
             "package": {
                 "name": "rg3/youtube-dl",
-                "version": "2015.11.13",
+                "version": "2015.12.06",
                 "source": {
                     "url": "https://github.com/rg3/youtube-dl.git",
                     "type": "git",
-                    "reference": "2015.11.13"
+                    "reference": "2015.12.06"
                 }
             }
         },

diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar
diff --git a/controllers/FrontController.php b/controllers/FrontController.php
@@ -191,7 +191,7 @@ static function redirect()
                 $app->redirect($video['url']);
             } catch (\Exception $e) {
                 $app->response->headers->set('Content-Type', 'text/plain');
-                echo $e->getMessage();
+                echo $e->getMessage().PHP_EOL;
             }
         }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "alltube",
-    "version": "0.4.2",
+    "version": "0.4.3",
     "dependencies": {
         "grunt": "~0.4.5",
         "grunt-cli": "~0.1.13",

diff --git a/php.ini b/php.ini
@@ -0,0 +1 @@
+date.timezone = UTC