Merge 1a92f206f7bd4a8c956668e18b1f08d1da8d7bcd into adacce4ba156ad35a1386fe1b8c19bd929e420f8
This commit is contained in:
commit
479bf949a1
10
Dockerfile
10
Dockerfile
@ -1,12 +1,12 @@
|
||||
FROM ubuntu
|
||||
FROM ubuntu:16.10
|
||||
MAINTAINER Christian Lück <christian@lueck.tv>
|
||||
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
|
||||
nginx supervisor php5-fpm php5-cli php5-curl php5-gd php5-json \
|
||||
php5-pgsql php5-mysql php5-mcrypt && apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get upgrade -y && apt-get install -y \
|
||||
nginx supervisor php-fpm php-cli php-curl php-gd php-json \
|
||||
php-pgsql php-mysql php-mcrypt && apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# enable the mcrypt module
|
||||
RUN php5enmod mcrypt
|
||||
RUN phpenmod mcrypt
|
||||
|
||||
# add ttrss as the only nginx site
|
||||
ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss
|
||||
|
Loading…
x
Reference in New Issue
Block a user