Update Dockerfile

fix source image from incremental job

.github/workflows/main.yml

@@ -4,9 +4,8 @@ on:
   push:
     branches: 
       - master
-      - github-actions
   schedule:
-    - cron: 0 18 * * *
+    - cron: 0 18 * * 0
 
 jobs:
 
@@ -75,19 +74,19 @@ jobs:
           - scheme: minimal
             source: infraonly
           - scheme: basic
-            source: minimal
+            source: minimal-incremental
           - scheme: small
-            source: basic
+            source: basic-incremental
           - scheme: context
-            source: small
+            source: small-incremental
           - scheme: gust
-            source: context
+            source: context-incremental
           - scheme: medium
-            source: gust
+            source: gust-incremental
           - scheme: tetex
-            source: medium
+            source: medium-incremental
           - scheme: full
-            source: tetex
+            source: tetex-incremental
       
     steps:
       - uses: actions/checkout@v2

README.md

@@ -1,18 +1,21 @@
+![Deploy](https://github.com/icaotix-docker/latex/workflows/Deploy/badge.svg)
+
 # Schemes/Tags
 ## Sizes
-* `infraonly` - infrastructure-only scheme (no TeX at all)
+* `infraonly`, `infraonly-scratch` - infrastructure-only scheme (no TeX at all)
-* `minimal` - minimal scheme (plain only)
+* `minimal`, `minimal-scratch`, `minimal-incremental` - minimal scheme (plain only)
-* `basic` - basic scheme (plain and latex)
+* `basic`, `basic-scratch`, `basic-incremental` - basic scheme (plain and latex)
-* `small` - small scheme (basic + xetex, metapost, a few languages)
+* `small`, `small-scratch`, `small-incremental` - small scheme (basic + xetex, metapost, a few languages)
-* `medium` - medium scheme (small + more packages and languages)
+* `medium`, `medium-scratch`, `medium-incremental` - medium scheme (small + more packages and languages)
-* `full`, `latest` - full scheme (everything)
+* `full`, `full-scratch`, `full-incremental`, `latest` - full scheme (everything)
 
 ## Extra Schemes
-* `gust` - GUST TeX Live scheme
+* `gust`, `gust-scratch`, `gust-incremental` - GUST TeX Live scheme
-* `context` - ConTeXt scheme
+* `context`, `context-scratch`, `context-incremental` - ConTeXt scheme
-* `tetex` - teTeX scheme (more than medium, but nowhere near full)
+* `tetex`, `tetex-scratch`, `tetex-incremental` - teTeX scheme (more than medium, but nowhere near full)
 
-## Build Info (Image tree)
+## Build Info `<tag>-incremental` (Image tree)
+Images with this tag have all previous layers built in, use them for better caching.
 ```
 infraonly (base image with ubuntu:18.04)
 +---> minimal
@@ -24,8 +27,12 @@ infraonly (base image with ubuntu:18.04)
 +---> tetex
 +---> full
 ```
+NOTE: infraonly has no `incremental` tag.
 
-# How to use
+## Build Info `<tag>-scratch`
+These images are built from the base ubuntu:18.04 image. They only have one latex layer. They are usually a little bit smaller than their `incremental` counterparts. The `scratch` image is default when used with no tag extension. Also `latest` is built from scratch and is the same as `full` and `full-scratch`.
+
+# How to use the image
 Mount your source code at `/data` and run whatever you want with LaTeX.
 
 # How to extend an Image
@@ -45,3 +52,5 @@ RUN apt-get update \
     && pip install pygments \
     && rm -rf /var/lib/apt/lists/*
 ```
+
+Last updated: 2022-08-18

scratch/Dockerfile

@@ -5,7 +5,7 @@ ENV HOME /data
 WORKDIR /data
 
 RUN apt-get update -q \
-    && apt-get install -qy build-essential wget libfontconfig1 \
+    && apt-get install -qy libfontconfig1 tar perl wget \
     && rm -rf /var/lib/apt/lists/*
 
 ARG SCHEME
@@ -13,9 +13,9 @@ ARG SCHEME
 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 \
+    && rm install-tl-unx.tar.gz \
     && echo "selected_scheme scheme-${SCHEME}" >> /install-tl-unx/texlive.profile \
     && /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \
-    && rm -r /install-tl-unx \
+    && rm -r /install-tl-unx
-	&& rm install-tl-unx.tar.gz
 
-ENV PATH="/usr/local/texlive/2019/bin/x86_64-linux:${PATH}"
+ENV PATH="/usr/local/texlive/2022/bin/x86_64-linux:${PATH}"