1
0

fix startup and drop 18.12 tag build
All checks were successful
the build was successful

This commit is contained in:
Hanjo Meinhardt 2019-05-21 21:15:39 +02:00
parent 9349cf0462
commit 8889a275c0
3 changed files with 7 additions and 4 deletions

View File

@ -18,5 +18,4 @@ pipeline:
matrix:
TTRSS_GIT_TAG:
- master
- 18.12
- 19.2

View File

@ -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

View File

@ -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;"