From 60074f56c6f7f4662e94df4548b509e18ed6bf48 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 27 Mar 2020 19:35:23 +0100 Subject: [PATCH 1/3] Add new structure documentation in readme --- README.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/README.md b/README.md index f7d10a0..dda2232 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,36 @@ * `context` - ConTeXt scheme * `tetex` - teTeX scheme (more than medium, but nowhere near full) +## Build Info (Image tree) +``` + infraonly + + + | + | + v + minimal + + + | + | + v + basic + +-------+------+ + | | | + | | | + v v v +context small gust + + + | + | + v + medium + + + | + +----+---+ + v v + full tetex +``` + # How to use Mount your source code at `/data` and run whatever you want with LaTeX. From f6aab495332ea34ec430dec0ccd790314a8b8f4b Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Sat, 28 Mar 2020 02:15:43 +0100 Subject: [PATCH 2/3] Change build to build schemes incrementally Move Dockerfiles from ctan up one folder --- README.md | 35 +++++-------------- ctan/Dockerfile.basic | 3 ++ ctan/Dockerfile.context | 3 ++ ctan/Dockerfile.full | 3 ++ ctan/Dockerfile.gust | 3 ++ .../Dockerfile => Dockerfile.infraonly} | 0 ctan/Dockerfile.medium | 3 ++ ctan/Dockerfile.minimal | 3 ++ ctan/Dockerfile.small | 3 ++ ctan/Dockerfile.tetex | 3 ++ ctan/basic/Dockerfile | 20 ----------- ctan/context/Dockerfile | 20 ----------- ctan/full/Dockerfile | 20 ----------- ctan/gust/Dockerfile | 20 ----------- ctan/medium/Dockerfile | 20 ----------- ctan/minimal/Dockerfile | 20 ----------- ctan/small/Dockerfile | 20 ----------- ctan/tetex/Dockerfile | 20 ----------- script.bat | 18 ++++++++++ 19 files changed, 51 insertions(+), 186 deletions(-) create mode 100644 ctan/Dockerfile.basic create mode 100644 ctan/Dockerfile.context create mode 100644 ctan/Dockerfile.full create mode 100644 ctan/Dockerfile.gust rename ctan/{infraonly/Dockerfile => Dockerfile.infraonly} (100%) create mode 100644 ctan/Dockerfile.medium create mode 100644 ctan/Dockerfile.minimal create mode 100644 ctan/Dockerfile.small create mode 100644 ctan/Dockerfile.tetex delete mode 100644 ctan/basic/Dockerfile delete mode 100644 ctan/context/Dockerfile delete mode 100644 ctan/full/Dockerfile delete mode 100644 ctan/gust/Dockerfile delete mode 100644 ctan/medium/Dockerfile delete mode 100644 ctan/minimal/Dockerfile delete mode 100644 ctan/small/Dockerfile delete mode 100644 ctan/tetex/Dockerfile create mode 100644 script.bat diff --git a/README.md b/README.md index dda2232..51f78c4 100644 --- a/README.md +++ b/README.md @@ -14,32 +14,15 @@ ## Build Info (Image tree) ``` - infraonly - + - | - | - v - minimal - + - | - | - v - basic - +-------+------+ - | | | - | | | - v v v -context small gust - + - | - | - v - medium - + - | - +----+---+ - v v - full tetex +infraonly (base image with ubuntu:18.04) ++---> minimal ++---> basic ++---> small ++---> context ++---> gust ++---> medium ++---> tetex ++---> full ``` # How to use diff --git a/ctan/Dockerfile.basic b/ctan/Dockerfile.basic new file mode 100644 index 0000000..336e06e --- /dev/null +++ b/ctan/Dockerfile.basic @@ -0,0 +1,3 @@ +FROM icaotix/latex:minimal + +RUN tlmgr install scheme-basic diff --git a/ctan/Dockerfile.context b/ctan/Dockerfile.context new file mode 100644 index 0000000..125a1b4 --- /dev/null +++ b/ctan/Dockerfile.context @@ -0,0 +1,3 @@ +FROM icaotix/latex:small + +RUN tlmgr install scheme-context diff --git a/ctan/Dockerfile.full b/ctan/Dockerfile.full new file mode 100644 index 0000000..eb2163e --- /dev/null +++ b/ctan/Dockerfile.full @@ -0,0 +1,3 @@ +FROM icaotix/latex:tetex + +RUN tlmgr install scheme-full \ No newline at end of file diff --git a/ctan/Dockerfile.gust b/ctan/Dockerfile.gust new file mode 100644 index 0000000..4a3916d --- /dev/null +++ b/ctan/Dockerfile.gust @@ -0,0 +1,3 @@ +FROM icaotix/latex:context + +RUN tlmgr install scheme-gust \ No newline at end of file diff --git a/ctan/infraonly/Dockerfile b/ctan/Dockerfile.infraonly similarity index 100% rename from ctan/infraonly/Dockerfile rename to ctan/Dockerfile.infraonly diff --git a/ctan/Dockerfile.medium b/ctan/Dockerfile.medium new file mode 100644 index 0000000..e5052eb --- /dev/null +++ b/ctan/Dockerfile.medium @@ -0,0 +1,3 @@ +FROM icaotix/latex:gust + +RUN tlmgr install scheme-medium diff --git a/ctan/Dockerfile.minimal b/ctan/Dockerfile.minimal new file mode 100644 index 0000000..c16dfb7 --- /dev/null +++ b/ctan/Dockerfile.minimal @@ -0,0 +1,3 @@ +FROM icaotix/latex:infraonly + +RUN tlmgr install scheme-minimal diff --git a/ctan/Dockerfile.small b/ctan/Dockerfile.small new file mode 100644 index 0000000..a119f75 --- /dev/null +++ b/ctan/Dockerfile.small @@ -0,0 +1,3 @@ +FROM icaotix/latex:basic + +RUN tlmgr install scheme-small diff --git a/ctan/Dockerfile.tetex b/ctan/Dockerfile.tetex new file mode 100644 index 0000000..7d3af10 --- /dev/null +++ b/ctan/Dockerfile.tetex @@ -0,0 +1,3 @@ +FROM icaotix/latex:medium + +RUN tlmgr install scheme-tetex diff --git a/ctan/basic/Dockerfile b/ctan/basic/Dockerfile deleted file mode 100644 index 4c16aba..0000000 --- a/ctan/basic/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-basic -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-basic" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/context/Dockerfile b/ctan/context/Dockerfile deleted file mode 100644 index ee3a443..0000000 --- a/ctan/context/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-context -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-context" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/full/Dockerfile b/ctan/full/Dockerfile deleted file mode 100644 index abd6b74..0000000 --- a/ctan/full/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-full -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-full" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/gust/Dockerfile b/ctan/gust/Dockerfile deleted file mode 100644 index 56d7391..0000000 --- a/ctan/gust/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-gust -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-gust" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/medium/Dockerfile b/ctan/medium/Dockerfile deleted file mode 100644 index b328c80..0000000 --- a/ctan/medium/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-medium -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-medium" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/minimal/Dockerfile b/ctan/minimal/Dockerfile deleted file mode 100644 index ed8fbcf..0000000 --- a/ctan/minimal/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-minimal -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-minimal" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/small/Dockerfile b/ctan/small/Dockerfile deleted file mode 100644 index 7b15923..0000000 --- a/ctan/small/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-small -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-small" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/ctan/tetex/Dockerfile b/ctan/tetex/Dockerfile deleted file mode 100644 index 3efa2b3..0000000 --- a/ctan/tetex/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:18.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV HOME /data -WORKDIR /data - -RUN apt-get update -q \ - && apt-get install -qy build-essential wget libfontconfig1 \ - && rm -rf /var/lib/apt/lists/* - -# Install TexLive with scheme-tetex -RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz \ - && mkdir /install-tl-unx \ - && tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1 \ - && echo "selected_scheme scheme-tetex" >> /install-tl-unx/texlive.profile \ - && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \ - && rm -r /install-tl-unx \ - && rm install-tl-unx.tar.gz - -ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}" diff --git a/script.bat b/script.bat new file mode 100644 index 0000000..c7f83fe --- /dev/null +++ b/script.bat @@ -0,0 +1,18 @@ +docker build -t icaotix/latex:infraonly -f Dockerfile.infraonly . + +docker build -t icaotix/latex:minimal -f Dockerfile.minimal . + +docker build -t icaotix/latex:basic -f Dockerfile.basic . + +docker build -t icaotix/latex:small -f Dockerfile.small . + +docker build -t icaotix/latex:context -f Dockerfile.context . + +docker build -t icaotix/latex:gust -f Dockerfile.gust . + +docker build -t icaotix/latex:medium -f Dockerfile.medium . + +docker build -t icaotix/latex:tetex -f Dockerfile.tetex . + +docker build -t icaotix/latex:full -f Dockerfile.full . + From 707ccd961da11ce94800e57c5f936baeb6c0fbb7 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Sat, 28 Mar 2020 02:19:10 +0100 Subject: [PATCH 3/3] remove script, fix whitespace --- README.md | 14 +++++++------- script.bat | 18 ------------------ 2 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 script.bat diff --git a/README.md b/README.md index 51f78c4..91771e0 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,13 @@ ## Build Info (Image tree) ``` infraonly (base image with ubuntu:18.04) -+---> minimal -+---> basic -+---> small -+---> context -+---> gust -+---> medium -+---> tetex ++---> minimal ++---> basic ++---> small ++---> context ++---> gust ++---> medium ++---> tetex +---> full ``` diff --git a/script.bat b/script.bat deleted file mode 100644 index c7f83fe..0000000 --- a/script.bat +++ /dev/null @@ -1,18 +0,0 @@ -docker build -t icaotix/latex:infraonly -f Dockerfile.infraonly . - -docker build -t icaotix/latex:minimal -f Dockerfile.minimal . - -docker build -t icaotix/latex:basic -f Dockerfile.basic . - -docker build -t icaotix/latex:small -f Dockerfile.small . - -docker build -t icaotix/latex:context -f Dockerfile.context . - -docker build -t icaotix/latex:gust -f Dockerfile.gust . - -docker build -t icaotix/latex:medium -f Dockerfile.medium . - -docker build -t icaotix/latex:tetex -f Dockerfile.tetex . - -docker build -t icaotix/latex:full -f Dockerfile.full . -