From 28ae86b5f899b42cff55af33dd9aecd2c92e45c4 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 30 May 2018 14:50:28 -0700 Subject: [PATCH] remove ttrss patch (plugin has not been updated in years) --- Dockerfile | 6 ++---- change-ttrss-file-path.patch | 21 --------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 change-ttrss-file-path.patch diff --git a/Dockerfile b/Dockerfile index 8cac844..56ac00d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,11 +18,9 @@ RUN mv data data-orig && ln -s /app/data data # official extensions ADD change-ttrss-file-path.patch /app/code/change-ttrss-file-path.patch RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \ - | tar -xz --strip-components=1 -C /app/code/extensions \ - && patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \ + | tar -xz --strip-components=1 -C /app/code/extensions && mv /app/code/extensions /app/code/extensions-orig \ - && ln -s /app/data/extensions /app/code/extensions \ - && ln -s /app/data/extensions/ttrss.php /app/code/p/api/ttrss.php + && ln -s /app/data/extensions /app/code/extensions # configure apache RUN rm /etc/apache2/sites-enabled/* diff --git a/change-ttrss-file-path.patch b/change-ttrss-file-path.patch deleted file mode 100644 index 02c203b..0000000 --- a/change-ttrss-file-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru extensions-orig/xExtension-TTRSS_API/extension.php extensions/xExtension-TTRSS_API/extension.php ---- extensions-orig/xExtension-TTRSS_API/extension.php 2016-12-15 10:24:17.000000000 +0000 -+++ extensions/xExtension-TTRSS_API/extension.php 2017-02-18 13:06:59.640761922 +0000 -@@ -9,7 +9,7 @@ - public function install() { - $filename = 'ttrss.php'; - $file_source = join_path($this->getPath(), $filename); -- $path_destination = join_path(PUBLIC_PATH, 'api'); -+ $path_destination = '/app/data/extensions'; - $file_destination = join_path($path_destination, $filename); - - if (!is_writable($path_destination)) { -@@ -35,7 +35,7 @@ - - public function uninstall() { - $filename = 'ttrss.php'; -- $file_destination = join_path(PUBLIC_PATH, 'api', $filename); -+ $file_destination = join_path('/app/data/extensions', $filename); - - if (file_exists($file_destination) && !unlink($file_destination)) { - return 'API file cannot be removed';