From 58de37f809e5e2488b016383a45cf11088cbdb9f Mon Sep 17 00:00:00 2001 From: boyska Date: Thu, 9 Aug 2018 16:52:03 +0200 Subject: [PATCH] tt-rss running on alpine same base image as rss-bridge, so that the whole environment is more coherent --- docker-compose.yml | 8 ++++++-- docker/Dockerfile-tt-rss | 14 ++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e512cb4..1a48912 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,11 +20,15 @@ services: dockerfile: ./docker/Dockerfile-tt-rss container_name: feedati_tt_rss volumes: - - ./tt-rss:/var/www/html - - ./docker/ttrss-config.php:/var/www/html/config.php:ro + - ./tt-rss:/app/public/ + - ./docker/ttrss-config.php:/app/public/config.php:ro ports: - 8000:80 - 9312:9312 + environment: + - APACHE_SERVER_NAME=tt-rss + - PHP_DISPLAY_ERRORS=stdout + - PHP_DISPLAY_STARTUP_ERROR=1 rss-bridge: image: feedati/rss-bridge:latest diff --git a/docker/Dockerfile-tt-rss b/docker/Dockerfile-tt-rss index 430ca39..b4ca52c 100644 --- a/docker/Dockerfile-tt-rss +++ b/docker/Dockerfile-tt-rss @@ -1,10 +1,4 @@ -FROM php:7.2-apache - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && apt-get install --no-install-recommends -y libpq-dev \ - && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ - && docker-php-ext-install pdo pgsql pdo_pgsql \ - && docker-php-ext-enable pdo pgsql pdo_pgsql \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -COPY tt-rss/* /var/www/html/ +FROM ulsmith/alpine-apache-php7 +RUN apk add --update php7-pgsql php7-fileinfo && apk del php7-pdo_mysql php7-pdo_odbc php7-pdo_sqlite db php7-redis php7-ftp && rm -rf /var/cache/apk/ +COPY tt-rss/* /app/public/ +RUN chown -R apache:root /app/public