From 8889a275c09aee704201d63db012d638fe3f206d Mon Sep 17 00:00:00 2001 From: Hanjo Meinhardt Date: Tue, 21 May 2019 21:15:39 +0200 Subject: [PATCH] fix startup and drop 18.12 tag build --- .drone.yml | 1 - Dockerfile | 6 +++++- supervisord.conf | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2063c80..4368aa5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,5 +18,4 @@ pipeline: matrix: TTRSS_GIT_TAG: - master - - 18.12 - 19.2 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ae0bd23..83ac19a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,9 @@ RUN apt-get update && apt-get install -y \ php7.2-json \ php7.2-pgsql \ php7.2-mysql \ + php7.2-intl \ + php7.2-mbstring \ + php7.2-xml \ curl \ && apt-get clean && rm -rf /var/lib/apt/lists/* @@ -31,8 +34,9 @@ WORKDIR /var/www # && apt-get purge -y --auto-remove curl \ RUN curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /var/www --strip-components 1 \ + && cp config.php-dist config.php \ && chown www-data:www-data -R /var/www \ - && cp config.php-dist config.php + && mkdir /var/run/php # expose only nginx HTTP port EXPOSE 80 diff --git a/supervisord.conf b/supervisord.conf index f117df0..92b8f55 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,8 +1,8 @@ [supervisord] nodaemon=true -[program:php5-fpm] -command=/usr/sbin/php5-fpm --nodaemonize +[program:php-fpm7.2] +command=/usr/sbin/php-fpm7.2 --nodaemonize [program:nginx] command=/usr/sbin/nginx -g "daemon off;"