Skip to content

Update for latest ubuntu image and Docker 1.4.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 25 additions & 0 deletions fig.yml
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 1 addition & 3 deletions git-clone/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
FROM stackbrew/ubuntu:precise
MAINTAINER Tom Offermann <[email protected]>

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
Expand Down
1 change: 0 additions & 1 deletion http-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
FROM stackbrew/ubuntu:precise
MAINTAINER Tom Offermann <[email protected]>

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

Expand Down
4 changes: 1 addition & 3 deletions pandoc-convert/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
FROM pandoc
MAINTAINER Tom Offermann <[email protected]>

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
Expand Down
2 changes: 0 additions & 2 deletions pandoc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
FROM stackbrew/ubuntu:precise
MAINTAINER Tom Offermann <[email protected]>

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

Expand Down