Skip to content

Commit

Permalink
docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
rwcarlsen committed Aug 4, 2015
1 parent f5fb30d commit 660d3bb
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ help:
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"

html-docker gh-preview-docker:
docker run -w /cyclus.github.com -v $(PWD):/cyclus.github.com cyclus/fuelcycle.org-deps make gh-preview

gh-clean gh-revert clean:
-rm -rf $(BUILDDIR)

Expand Down
13 changes: 12 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ branch, you may always run::

make html

Or if you have docker, you can forget about the other dependencies and just
run::

make html-docker

Best practice workflow for contributing to site changes
--------------------------------------------------------

Expand All @@ -70,7 +75,13 @@ Best practice workflow for contributing to site changes

This will build a version of the site in the `gh-build` directory of
your branch, `add_some_info`. You can load it directly in a local
browser.
browser. Or if you have docker installed, you can optionally use the
docker preview target:

``make gh-preview-docker``

to build the website inside a docker container with all the correct
dependencies and configuration taken care of automagically.

6. Repeat steps 4-5 until satisfied.

Expand Down
8 changes: 8 additions & 0 deletions docker/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

``fuelcycle.org-deps`` contains a dockerfile with all dependencies for
building cymetric. This is used by the docker based build targets added to
the makefile. This image will need to be updated and repushed to docker hub
periodically when dependencies for the website need updating. Particularly,
this image will need to be rebuilt whenever there is a new release of
cyclus+cycamore.

12 changes: 12 additions & 0 deletions docker/fuelcycle.org-deps/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

FROM cyclus/cycamore

RUN apt-get install -y --force-yes python3-pip
RUN pip3 install sphinx sphinxcontrib-bibtex cloud-sptheme

WORKDIR /
RUN git clone https://github.com/cyclus/cymetric
WORKDIR /cymetric
RUN python setup.py install
WORKDIR /

0 comments on commit 660d3bb

Please sign in to comment.