diff --git a/example.sh b/example.sh index f836f51..852953d 100755 --- a/example.sh +++ b/example.sh @@ -4,16 +4,16 @@ set -e echo "** Creating data container." -docker run -name pandoc-data data true +docker run --name pandoc-data data true echo "** Cloning git repository to data container and saving doc directory." -docker run -volumes-from pandoc-data git-clone https://github.com/isaacs/npm +docker run --volumes-from pandoc-data git-clone https://github.com/isaacs/npm echo "** Converting doc directory to html using pandoc." -docker run -volumes-from pandoc-data pandoc-convert /data/md /data/html +docker run --volumes-from pandoc-data pandoc-convert /data/md /data/html echo "** Listing /data/html on data container to show resulting HTML files." -docker run -volumes-from pandoc-data busybox ls -al /data/html +docker run --volumes-from pandoc-data busybox ls -al /data/html echo "** Serving /data/html on port 8080." -docker run -d -volumes-from pandoc-data -p 8080:8080 http-server /data/html +docker run -d --volumes-from pandoc-data -p 8080:8080 http-server /data/html diff --git a/fig.yml b/fig.yml new file mode 100644 index 0000000..c192741 --- /dev/null +++ b/fig.yml @@ -0,0 +1,25 @@ +data: + build: data + command: true +clone: + build: git-clone + command: https://github.com/isaacs/npm + volumes_from: + - data +convert: + build: pandoc-convert + command: /data/md /data/html + volumes_from: + - data +list: + image: busybox + command: ls -al /data/html + volumes_from: + - data +web: + build: http-server + command: /data/html + volumes_from: + - data + ports: + - "8080:8080" diff --git a/git-clone/Dockerfile b/git-clone/Dockerfile index 7e03890..d010229 100644 --- a/git-clone/Dockerfile +++ b/git-clone/Dockerfile @@ -5,10 +5,8 @@ FROM stackbrew/ubuntu:precise MAINTAINER Tom Offermann -RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list - RUN apt-get update -RUN apt-get -y install git python python-pip +RUN apt-get -y install git python-pip RUN pip install --upgrade pip docopt VOLUME /data diff --git a/http-server/Dockerfile b/http-server/Dockerfile index a347f0b..e9039d6 100644 --- a/http-server/Dockerfile +++ b/http-server/Dockerfile @@ -3,7 +3,6 @@ FROM stackbrew/ubuntu:precise MAINTAINER Tom Offermann -RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list RUN echo "deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu precise main" >> /etc/apt/sources.list RUN apt-get update diff --git a/pandoc-convert/Dockerfile b/pandoc-convert/Dockerfile index 0f4d601..ec056a7 100644 --- a/pandoc-convert/Dockerfile +++ b/pandoc-convert/Dockerfile @@ -4,10 +4,8 @@ FROM pandoc MAINTAINER Tom Offermann -RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list - RUN apt-get update -RUN apt-get -y install rsync python python-pip +RUN apt-get -y install rsync python-pip RUN pip install --upgrade pip RUN pip install docopt diff --git a/pandoc/Dockerfile b/pandoc/Dockerfile index 346793f..2afe06c 100644 --- a/pandoc/Dockerfile +++ b/pandoc/Dockerfile @@ -4,8 +4,6 @@ FROM stackbrew/ubuntu:precise MAINTAINER Tom Offermann -RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list - RUN apt-get update RUN apt-get -y install pandoc