split out the builder container and add feedly theme
This commit is contained in:
parent
7516021cd0
commit
2bfb576ef4
37
Dockerfile
37
Dockerfile
@ -1,9 +1,25 @@
|
||||
FROM ubuntu:18.04 AS builder
|
||||
|
||||
ARG TTRSS_GIT_TAG=master
|
||||
ARG FEEDLY_GIT_TAG=master
|
||||
|
||||
# install curl to fetch stuff
|
||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
curl
|
||||
|
||||
# download tagged version of tt-rss sources
|
||||
RUN mkdir -p /download/ttrss \
|
||||
&& curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /download/ttrss --strip-components 1
|
||||
|
||||
# download some themes
|
||||
RUN mkdir -p /download/feedly-theme \
|
||||
&& curl -SL https://github.com/levito/tt-rss-feedly-theme/archive/v$FEEDLY_GIT_TAG.tar.gz | tar xzC /download/feedly-theme --strip-components 1
|
||||
|
||||
|
||||
FROM ubuntu:18.04
|
||||
MAINTAINER Hanjo Meinhardt <hanjo@bunix.de>
|
||||
|
||||
ARG TTRSS_GIT_TAG=master
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
nginx \
|
||||
supervisor \
|
||||
php7.2-fpm \
|
||||
@ -16,12 +32,8 @@ RUN apt-get update && apt-get install -y \
|
||||
php7.2-intl \
|
||||
php7.2-mbstring \
|
||||
php7.2-xml \
|
||||
curl \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# enable the mcrypt module
|
||||
#RUN php7enmod mcrypt
|
||||
|
||||
# add ttrss as the only nginx site
|
||||
ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss
|
||||
RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
|
||||
@ -30,14 +42,17 @@ RUN rm /etc/nginx/sites-enabled/default
|
||||
# install ttrss and patch configuration
|
||||
WORKDIR /var/www
|
||||
|
||||
#RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \
|
||||
# && apt-get purge -y --auto-remove curl \
|
||||
# copy the ttrss sources
|
||||
COPY --from=builder /download/ttrss ./
|
||||
|
||||
RUN curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /var/www --strip-components 1
|
||||
# copy the feedly theme files
|
||||
COPY --from=builder /download/feedly-theme/feedly ./themes.local/feedly/
|
||||
COPY --from=builder /download/feedly-theme/feedly*.css ./themes.local/
|
||||
|
||||
# prepare the runtime environment
|
||||
RUN cp config.php-dist config.php \
|
||||
&& chown www-data:www-data -R /var/www \
|
||||
&& mkdir /var/run/php
|
||||
&& mkdir -p /var/run/php
|
||||
|
||||
# expose only nginx HTTP port
|
||||
EXPOSE 80
|
||||
|
Loading…
Reference in New Issue
Block a user