From a61c7e8a496ce2fed2834a01d79abdda3281fe90 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Wed, 3 Jan 2018 11:25:03 -0700 Subject: [PATCH] Install JRE and csh in Docker image These are currently needed to run lsst-texmf's acronyms.csh. Includes doc update. --- Dockerfile | 7 +++++++ docs/docker.rst | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec456b90..4c99e5d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,13 @@ FROM lsstsqre/lsst-texlive:latest MAINTAINER LSST SQuaRE +# Additional dependencies for lsst-texmf (acronyms.csh) +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + csh \ + default-jre && \ + apt-get clean + # Point $TEXMFHOME to the container's lsst-texmf. This environment variable # exists for container runs by a user. ENV TEXMFHOME "/texmf" diff --git a/docs/docker.rst b/docs/docker.rst index 6a70608d..e29e5328 100644 --- a/docs/docker.rst +++ b/docs/docker.rst @@ -54,8 +54,10 @@ About the lsst-texmf Docker image ================================= The `lsstsqre/lsst-texmf`_ Docker image is based on Ubuntu 14.04 (trusty). -It contains a full `TeX Live`_ distribution, as well as ``make`` and ``git`` via the `lsstsqre/lsst-texlive`_ image. +It contains a full `TeX Live`_ distribution, as well as ``make`` and ``git``, via the `lsstsqre/lsst-texlive`_ image. +The image also contains a Java runtime for ``acronyms.csh``. ``lsst-texmf`` is installed in the container's ``/texmf`` directory, with :envvar:`TEXMFHOME` pre-set to that directory. +Scripts from ``lsst-texmf``\ ’s :file:`/bin` directory are available in the container's ``PATH``. The ``latest`` tag tracks the ``master`` branch. Other tags may be available for pinned versions and development branches.