From 7d905da02eae7e2bc15eca1ad6333d696953fdbe Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 19 Jul 2015 11:36:05 -0400 Subject: [PATCH] Update Docker config --- Dockerfile | 4 ++-- docs/docker.markdown | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01e38d3..10782f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM ubuntu:14.04 MAINTAINER Frederic Guillot -RUN apt-get update && apt-get install -y apache2 php5 php5-sqlite git curl && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apache2 php5 php5-sqlite git && apt-get clean && rm -rf /var/lib/apt/lists/* RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf RUN cd /var/www && git clone --depth 1 https://github.com/miniflux/miniflux.git -RUN rm -rf /var/www/html && mv /var/www/kanboard /var/www/html +RUN rm -rf /var/www/html && mv /var/www/miniflux /var/www/html RUN chown -R www-data:www-data /var/www/html/data VOLUME /var/www/html/data diff --git a/docs/docker.markdown b/docs/docker.markdown index 493312b..9cb4434 100644 --- a/docs/docker.markdown +++ b/docs/docker.markdown @@ -1,6 +1,20 @@ Run Miniflux with Docker ======================== +Miniflux can run easily with [Docker](https://www.docker.com). +There is a `Dockerfile` in the repository to build your own container. + +Use the automated build +----------------------- + +Every new commit on the repository trigger a new build on [Docker Hub](https://registry.hub.docker.com/u/miniflux/miniflux/). + +```bash +docker run -d --name miniflux -p 80:80 -t miniflux/miniflux:latest +``` + +The tag **latest** is the **development version** of Miniflux, use at your own risk. + Build your own image -------------------- @@ -8,11 +22,8 @@ Build your own image docker build -t . ``` -Run container from the image ----------------------------- +Run container from the image: ```bash docker run -p 80:80 --name miniflux ``` - -Enjoy!