diff --git a/Dockerfile b/Dockerfile index efa88b6..05f7278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ 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 -p1 -d /app/code/extensions < /app/code/change-ttrss-file-path.patch \ + && patch -p0 -d /app/code < /app/code/change-ttrss-file-path.patch \ && 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 @@ -42,6 +42,9 @@ RUN rm /etc/apache2/sites-enabled/* \ RUN rm -rf /var/lib/php \ && ln -s /run/php /var/lib/php +ADD remove-update-menu.patch /app/code/remove-update-menu.patch +RUN patch -p0 -d /app/code < /app/code/remove-update-menu.patch + ADD start.sh /app/code/start.sh ADD set_config.php /app/code/set_config.php diff --git a/remove-update-menu.patch b/remove-update-menu.patch new file mode 100644 index 0000000..122134f --- /dev/null +++ b/remove-update-menu.patch @@ -0,0 +1,24 @@ +diff -Naru app-orig/layout/aside_configure.phtml app/layout/aside_configure.phtml +--- app-orig/layout/aside_configure.phtml 2016-12-26 15:33:47.000000000 +0000 ++++ app/layout/aside_configure.phtml 2017-02-23 14:48:10.214072522 +0000 +@@ -41,9 +41,5 @@ + Minz_Request::actionName() === 'checkInstall' ? ' active' : ''; ?>"> + + +-