Merge 1de5eb7a1d7a9022be40f0568a12ccad7ecceabe into adacce4ba156ad35a1386fe1b8c19bd929e420f8
This commit is contained in:
commit
2e3a453702
24
Dockerfile
24
Dockerfile
@ -1,25 +1,21 @@
|
|||||||
FROM ubuntu
|
FROM alpine:3.4
|
||||||
MAINTAINER Christian Lück <christian@lueck.tv>
|
MAINTAINER Christian Lück <christian@lueck.tv>
|
||||||
|
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
|
RUN apk add --update nginx supervisor php5-fpm php5-cli php5-curl php5-gd php5-json php5-dom php5-pcntl php5-posix \
|
||||||
nginx supervisor php5-fpm php5-cli php5-curl php5-gd php5-json \
|
php5-pgsql php5-mysql php5-mcrypt php5-pdo php5-pdo_pgsql php5-pdo_mysql ca-certificates && \
|
||||||
php5-pgsql php5-mysql php5-mcrypt && apt-get clean && rm -rf /var/lib/apt/lists/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
# enable the mcrypt module
|
|
||||||
RUN php5enmod mcrypt
|
|
||||||
|
|
||||||
# add ttrss as the only nginx site
|
# add ttrss as the only nginx site
|
||||||
ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss
|
ADD ttrss.nginx.conf /etc/nginx/nginx.conf
|
||||||
RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
|
|
||||||
RUN rm /etc/nginx/sites-enabled/default
|
|
||||||
|
|
||||||
# install ttrss and patch configuration
|
# install ttrss and patch configuration
|
||||||
WORKDIR /var/www
|
WORKDIR /var/www
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \
|
RUN apk add --update --virtual build-dependencies curl tar \
|
||||||
&& curl -SL https://tt-rss.org/gitlab/fox/tt-rss/repository/archive.tar.gz?ref=master | tar xzC /var/www --strip-components 1 \
|
&& curl -SL https://tt-rss.org/gitlab/fox/tt-rss/repository/archive.tar.gz?ref=master | tar xzC /var/www --strip-components 1 \
|
||||||
&& apt-get purge -y --auto-remove curl \
|
&& apk del build-dependencies \
|
||||||
&& chown www-data:www-data -R /var/www
|
&& rm -rf /var/cache/apk/* \
|
||||||
RUN cp config.php-dist config.php
|
&& cp config.php-dist config.php \
|
||||||
|
&& chown nobody:nginx -R /var/www
|
||||||
|
|
||||||
# expose only nginx HTTP port
|
# expose only nginx HTTP port
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
[supervisord]
|
[supervisord]
|
||||||
nodaemon=true
|
nodaemon=true
|
||||||
|
|
||||||
[program:php5-fpm]
|
[program:php-fpm]
|
||||||
command=/usr/sbin/php5-fpm --nodaemonize
|
command=/usr/bin/php-fpm --nodaemonize
|
||||||
|
|
||||||
[program:nginx]
|
[program:nginx]
|
||||||
command=/usr/sbin/nginx -g "daemon off;"
|
command=/usr/sbin/nginx
|
||||||
|
|
||||||
[program:ttrss-update-daemon]
|
[program:ttrss-update-daemon]
|
||||||
command=/usr/bin/php /var/www/update_daemon2.php
|
command=/usr/bin/php /var/www/update_daemon2.php
|
||||||
user=www-data
|
user=nobody
|
||||||
stdout_logfile=/tmp/%(program_name)s.stdout
|
stdout_logfile=/tmp/%(program_name)s.stdout
|
||||||
stderr_logfile=/tmp/%(program_name)s.stderr
|
stderr_logfile=/tmp/%(program_name)s.stderr
|
||||||
|
|
||||||
|
@ -1,18 +1,35 @@
|
|||||||
server {
|
daemon off;
|
||||||
listen 80;
|
pid /run/nginx.pid;
|
||||||
root /var/www;
|
worker_processes 1;
|
||||||
|
|
||||||
index index.php index.html;
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ =404;
|
|
||||||
}
|
|
||||||
|
|
||||||
location ~ \.php$ {
|
|
||||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
|
||||||
fastcgi_pass unix:/var/run/php5-fpm.sock;
|
|
||||||
fastcgi_index index.php;
|
|
||||||
include fastcgi_params;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
include mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
keepalive_timeout 65;
|
||||||
|
gzip on;
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
root /var/www;
|
||||||
|
|
||||||
|
index index.php index.html;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
fastcgi_pass 127.0.0.1:9000;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
include fastcgi_params;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user