From df4e3f1c78a9078f9b386b8c24f4c16695ff3c5f Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 04:56:23 +0100
Subject: [PATCH 01/23] Use build args to reduce number of Dockerfiles

---
 ctan/Dockerfile         | 6 ++++++
 ctan/Dockerfile.basic   | 3 ---
 ctan/Dockerfile.context | 3 ---
 ctan/Dockerfile.full    | 3 ---
 ctan/Dockerfile.gust    | 3 ---
 ctan/Dockerfile.medium  | 3 ---
 ctan/Dockerfile.minimal | 3 ---
 ctan/Dockerfile.small   | 3 ---
 ctan/Dockerfile.tetex   | 3 ---
 ctan/run.bat            | 8 ++++++++
 10 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 ctan/Dockerfile
 delete mode 100644 ctan/Dockerfile.basic
 delete mode 100644 ctan/Dockerfile.context
 delete mode 100644 ctan/Dockerfile.full
 delete mode 100644 ctan/Dockerfile.gust
 delete mode 100644 ctan/Dockerfile.medium
 delete mode 100644 ctan/Dockerfile.minimal
 delete mode 100644 ctan/Dockerfile.small
 delete mode 100644 ctan/Dockerfile.tetex
 create mode 100644 ctan/run.bat

diff --git a/ctan/Dockerfile b/ctan/Dockerfile
new file mode 100644
index 0000000..bd8815b
--- /dev/null
+++ b/ctan/Dockerfile
@@ -0,0 +1,6 @@
+ARG SOURCE=infraonly
+
+FROM icaotix/latex:$SOURCE
+ARG SCHEME=minimal
+
+RUN tlmgr install scheme-${SCHEME}
\ No newline at end of file
diff --git a/ctan/Dockerfile.basic b/ctan/Dockerfile.basic
deleted file mode 100644
index 336e06e..0000000
--- a/ctan/Dockerfile.basic
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:minimal
-
-RUN tlmgr install scheme-basic
diff --git a/ctan/Dockerfile.context b/ctan/Dockerfile.context
deleted file mode 100644
index 125a1b4..0000000
--- a/ctan/Dockerfile.context
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:small
-
-RUN tlmgr install scheme-context
diff --git a/ctan/Dockerfile.full b/ctan/Dockerfile.full
deleted file mode 100644
index eb2163e..0000000
--- a/ctan/Dockerfile.full
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 4a3916d..0000000
--- a/ctan/Dockerfile.gust
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:context
-
-RUN tlmgr install scheme-gust
\ No newline at end of file
diff --git a/ctan/Dockerfile.medium b/ctan/Dockerfile.medium
deleted file mode 100644
index e5052eb..0000000
--- a/ctan/Dockerfile.medium
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:gust
-
-RUN tlmgr install scheme-medium
diff --git a/ctan/Dockerfile.minimal b/ctan/Dockerfile.minimal
deleted file mode 100644
index c16dfb7..0000000
--- a/ctan/Dockerfile.minimal
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:infraonly
-
-RUN tlmgr install scheme-minimal
diff --git a/ctan/Dockerfile.small b/ctan/Dockerfile.small
deleted file mode 100644
index a119f75..0000000
--- a/ctan/Dockerfile.small
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:basic
-
-RUN tlmgr install scheme-small
diff --git a/ctan/Dockerfile.tetex b/ctan/Dockerfile.tetex
deleted file mode 100644
index 7d3af10..0000000
--- a/ctan/Dockerfile.tetex
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM icaotix/latex:medium
-
-RUN tlmgr install scheme-tetex
diff --git a/ctan/run.bat b/ctan/run.bat
new file mode 100644
index 0000000..3809c6a
--- /dev/null
+++ b/ctan/run.bat
@@ -0,0 +1,8 @@
+docker build -t icaotix/latex:minimal --build-arg SOURCE=infraonly --build-arg SCHEME=minimal .
+docker build -t icaotix/latex:basic --build-arg SOURCE=minimal --build-arg SCHEME=basic .
+docker build -t icaotix/latex:small --build-arg SOURCE=basic --build-arg SCHEME=small .
+docker build -t icaotix/latex:context --build-arg SOURCE=small --build-arg SCHEME=context .
+docker build -t icaotix/latex:gust --build-arg SOURCE=context --build-arg SCHEME=gust .
+docker build -t icaotix/latex:medium --build-arg SOURCE=gust --build-arg SCHEME=medium .
+docker build -t icaotix/latex:tetex --build-arg SOURCE=medium --build-arg SCHEME=tetex .
+docker build -t icaotix/latex:full --build-arg SOURCE=tetex --build-arg SCHEME=full .
\ No newline at end of file

From f3b6a59f54341298ac6b6f5a5c48555def835d14 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 18:48:02 +0100
Subject: [PATCH 02/23] Readme linebreak

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 91771e0..cb0e776 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To extend the one of the docker-images with your packages.
 `FROM icaotix/latex:<tag>`
 
 #### Install latex packages
-` RUN tlmgr install latexmk `
+` RUN tlmgr install latexmk `  
 ` RUN tlmgr install biber `
 
 #### Minted + Pygments

From 11c8d9252f4e65e123925b46f2a8be8af53dc701 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 18:30:36 +0100
Subject: [PATCH 03/23] Create main.yml

---
 .github/workflows/main.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..ddfcb0c
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,36 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: 
+      - master 
+      - github-actions
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  create-infraonly:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    
+    - name: Login to Dockerhub
+      run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
+    
+    - name: Build the image
+      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly ./ctan
+  
+  create-minimal:
+    runs-on: ubuntu-latest
+    needs: [create-infraonly]
+    steps:
+      - uses: actions/checkout@v2
+      
+      - name: Login to Dockerhub
+        run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
+    
+      - name: Build the image
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal -f Dockerfile.minimal ./ctan

From 97c5835d3514c59312886be3464bd63efe07f8cd Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 18:32:25 +0100
Subject: [PATCH 04/23] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ddfcb0c..a109c3b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
       run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
     - name: Build the image
-      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly ./ctan
+      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f ctan/Dockerfile.infraonly .
   
   create-minimal:
     runs-on: ubuntu-latest
@@ -33,4 +33,4 @@ jobs:
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
       - name: Build the image
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal -f Dockerfile.minimal ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal -f ctan/Dockerfile.minimal .

From 8b0799d7f095936b37237185cbd81bff91dad5d3 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 18:38:29 +0100
Subject: [PATCH 05/23] Add upload step

---
 .github/workflows/main.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a109c3b..21a3ae9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,6 +22,9 @@ jobs:
     
     - name: Build the image
       run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f ctan/Dockerfile.infraonly .
+      
+    - name: Upload the image
+      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
   create-minimal:
     runs-on: ubuntu-latest
@@ -34,3 +37,6 @@ jobs:
     
       - name: Build the image
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal -f ctan/Dockerfile.minimal .
+        
+      - name: Upload the image
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal

From f76a5a1431b7361597dd283945ff58199d0ab352 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 18:55:08 +0100
Subject: [PATCH 06/23] use build with arguments

---
 .github/workflows/main.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 21a3ae9..9f96762 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,10 +20,10 @@ jobs:
     - name: Login to Dockerhub
       run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
-    - name: Build the image
+    - name: Build infraonly
       run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f ctan/Dockerfile.infraonly .
       
-    - name: Upload the image
+    - name: Upload infraonly image
       run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
   create-minimal:
@@ -35,8 +35,9 @@ jobs:
       - name: Login to Dockerhub
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
-      - name: Build the image
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal -f ctan/Dockerfile.minimal .
+      - name: Build minimal 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal --build-arg SOURCE=infraonly --build-arg SCHEME=minimal .
         
-      - name: Upload the image
+      - name: Upload minimal image
         run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal

From 66a01cc0ea680889bfb5e92e0e47cad883f55c05 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 19:06:24 +0100
Subject: [PATCH 07/23] Add all stages to build all tags

---
 .github/workflows/main.yml | 46 +++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f96762..605166b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  create-infraonly:
+  build-infraonly:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -26,9 +26,9 @@ jobs:
     - name: Upload infraonly image
       run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
-  create-minimal:
+  build-incremental:
     runs-on: ubuntu-latest
-    needs: [create-infraonly]
+    needs: [build-infraonly]
     steps:
       - uses: actions/checkout@v2
       
@@ -38,6 +38,42 @@ jobs:
       - name: Build minimal 
         working-directory: ./ctan
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal --build-arg SOURCE=infraonly --build-arg SCHEME=minimal .
+
+      - name: Build basic 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:basic --build-arg SOURCE=minimal --build-arg SCHEME=basic .
+
+      - name: Build small 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:small --build-arg SOURCE=basic --build-arg SCHEME=small .
+
+      - name: Build context 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:context --build-arg SOURCE=small --build-arg SCHEME=context .
+
+      - name: Build gust 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:gust --build-arg SOURCE=context --build-arg SCHEME=gust .
+
+      - name: Build medium 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:medium --build-arg SOURCE=gust --build-arg SCHEME=medium .
+
+      - name: Build tetex 
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:tetex --build-arg SOURCE=medium --build-arg SCHEME=tetex .
+
+      - name: Build full
+        working-directory: ./ctan
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:full --build-arg SOURCE=tetex --build-arg SCHEME=full .
         
-      - name: Upload minimal image
-        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
+      - name: Upload images
+        run: |
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:basic
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:small
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:context
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:gust
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:medium
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:tetex
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:full

From 678dccced0c83f329fe52ce52b8c7d78c7ea4614 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 28 Mar 2020 20:28:02 +0100
Subject: [PATCH 08/23] Add latest tag

---
 .github/workflows/main.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 605166b..782c1a0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,7 +65,9 @@ jobs:
 
       - name: Build full
         working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:full --build-arg SOURCE=tetex --build-arg SCHEME=full .
+        run: |
+          docker build -t ${{secrets.DOCKERHUB_USER}}/latex:full --build-arg SOURCE=tetex --build-arg SCHEME=full .
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:full ${{secrets.DOCKERHUB_USER}}/latex:latest
         
       - name: Upload images
         run: |
@@ -77,3 +79,4 @@ jobs:
           docker push ${{secrets.DOCKERHUB_USER}}/latex:medium
           docker push ${{secrets.DOCKERHUB_USER}}/latex:tetex
           docker push ${{secrets.DOCKERHUB_USER}}/latex:full
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:latest

From b64a12a638f92b338704356b86786b1843ff462e Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 03:31:01 +0200
Subject: [PATCH 09/23] Remove Ubuntu, Remove run.bat

---
 ctan/run.bat           |  8 --------
 ubuntu/1804/Dockerfile | 10 ----------
 ubuntu/2004/Dockerfile | 10 ----------
 3 files changed, 28 deletions(-)
 delete mode 100644 ctan/run.bat
 delete mode 100644 ubuntu/1804/Dockerfile
 delete mode 100644 ubuntu/2004/Dockerfile

diff --git a/ctan/run.bat b/ctan/run.bat
deleted file mode 100644
index 3809c6a..0000000
--- a/ctan/run.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-docker build -t icaotix/latex:minimal --build-arg SOURCE=infraonly --build-arg SCHEME=minimal .
-docker build -t icaotix/latex:basic --build-arg SOURCE=minimal --build-arg SCHEME=basic .
-docker build -t icaotix/latex:small --build-arg SOURCE=basic --build-arg SCHEME=small .
-docker build -t icaotix/latex:context --build-arg SOURCE=small --build-arg SCHEME=context .
-docker build -t icaotix/latex:gust --build-arg SOURCE=context --build-arg SCHEME=gust .
-docker build -t icaotix/latex:medium --build-arg SOURCE=gust --build-arg SCHEME=medium .
-docker build -t icaotix/latex:tetex --build-arg SOURCE=medium --build-arg SCHEME=tetex .
-docker build -t icaotix/latex:full --build-arg SOURCE=tetex --build-arg SCHEME=full .
\ No newline at end of file
diff --git a/ubuntu/1804/Dockerfile b/ubuntu/1804/Dockerfile
deleted file mode 100644
index c4ea48a..0000000
--- a/ubuntu/1804/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:18.04
-
-ENV DEBIAN_FRONTEND noninteractive
-WORKDIR /data
-
-RUN apt-get update -q && apt-get install -qy \
-    texlive-base biber\
-    python-pygments gnuplot \
-    make git \
-    && rm -rf /var/lib/apt/lists/*
diff --git a/ubuntu/2004/Dockerfile b/ubuntu/2004/Dockerfile
deleted file mode 100644
index e529efa..0000000
--- a/ubuntu/2004/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND noninteractive
-WORKDIR /data
-
-RUN apt-get update -q && apt-get install -qy \
-    texlive-base biber\
-    python-pygments gnuplot \
-    make git \
-    && rm -rf /var/lib/apt/lists/*

From 0b85e12866b8b33c53a7abf90d027f07f01017d2 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 03:38:09 +0200
Subject: [PATCH 10/23] Use Matrix build strategy, Remove comments

---
 .github/workflows/main.yml | 71 ++++++++++++--------------------------
 1 file changed, 22 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 782c1a0..8e522cc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,27 +1,23 @@
-# This is a basic workflow to help you get started with Actions
+name: Deploy
 
-name: CI
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on:
   push:
     branches: 
       - master 
       - github-actions
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build-infraonly:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
     
     - name: Login to Dockerhub
       run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
     - name: Build infraonly
-      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f ctan/Dockerfile.infraonly .
+      working-directory: ./ctan
+      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly .
       
     - name: Upload infraonly image
       run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
@@ -29,54 +25,31 @@ jobs:
   build-incremental:
     runs-on: ubuntu-latest
     needs: [build-infraonly]
+    strategy:
+      matrix:
+        scheme : [minimal, basic] #, small, context, gust, medium, tetex, full]
+        include:
+          - scheme: minimal
+            source: infraonly
+          - scheme: basic
+            source: minimal
+      fail-fast: true
+      max-parallel: 1
     steps:
       - uses: actions/checkout@v2
       
       - name: Login to Dockerhub
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
-      - name: Build minimal 
+      - name: Build ${{matrix.scheme}} 
         working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:minimal --build-arg SOURCE=infraonly --build-arg SCHEME=minimal .
-
-      - name: Build basic 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:basic --build-arg SOURCE=minimal --build-arg SCHEME=basic .
-
-      - name: Build small 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:small --build-arg SOURCE=basic --build-arg SCHEME=small .
-
-      - name: Build context 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:context --build-arg SOURCE=small --build-arg SCHEME=context .
-
-      - name: Build gust 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:gust --build-arg SOURCE=context --build-arg SCHEME=gust .
-
-      - name: Build medium 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:medium --build-arg SOURCE=gust --build-arg SCHEME=medium .
-
-      - name: Build tetex 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:tetex --build-arg SOURCE=medium --build-arg SCHEME=tetex .
-
-      - name: Build full
-        working-directory: ./ctan
-        run: |
-          docker build -t ${{secrets.DOCKERHUB_USER}}/latex:full --build-arg SOURCE=tetex --build-arg SCHEME=full .
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:full ${{secrets.DOCKERHUB_USER}}/latex:latest
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
-      - name: Upload images
+      - name: Upload ${{ matrix.scheme }}
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
+
+      - name: Tag as latest
+        if: matrix.isLatest
         run: |
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:basic
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:small
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:context
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:gust
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:medium
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:tetex
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:full
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:full ${{secrets.DOCKERHUB_USER}}/latex:latest
           docker push ${{secrets.DOCKERHUB_USER}}/latex:latest

From 1991170c60f0b02e126ebe27563fcb6001a186e1 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 03:40:12 +0200
Subject: [PATCH 11/23] Disable push for testing

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e522cc..ac58bea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,8 +19,8 @@ jobs:
       working-directory: ./ctan
       run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly .
       
-    - name: Upload infraonly image
-      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+    #- name: Upload infraonly image
+    # run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
   build-incremental:
     runs-on: ubuntu-latest
@@ -45,8 +45,8 @@ jobs:
         working-directory: ./ctan
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
-      - name: Upload ${{ matrix.scheme }}
-        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
+      #- name: Upload ${{ matrix.scheme }}
+      #  run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
 
       - name: Tag as latest
         if: matrix.isLatest

From 2689630b7a4e91ce5bfd97510d189bc70335b3ca Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 03:51:14 +0200
Subject: [PATCH 12/23] Add full matrix and activate upload, activate scheduled
 run

---
 .github/workflows/main.yml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ac58bea..a49cd93 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,6 +5,8 @@ on:
     branches: 
       - master 
       - github-actions
+  schedule:
+    - cron: 0 18 * * *
 
 jobs:
   build-infraonly:
@@ -19,22 +21,35 @@ jobs:
       working-directory: ./ctan
       run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly .
       
-    #- name: Upload infraonly image
-    # run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+    - name: Upload infraonly image
+      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
   build-incremental:
     runs-on: ubuntu-latest
     needs: [build-infraonly]
     strategy:
+      max-parallel: 1
       matrix:
-        scheme : [minimal, basic] #, small, context, gust, medium, tetex, full]
+        scheme : [minimal, basic, small, context, gust, medium, tetex, full]
         include:
           - scheme: minimal
             source: infraonly
           - scheme: basic
             source: minimal
-      fail-fast: true
-      max-parallel: 1
+          - scheme: small
+            source: basic
+          - scheme: context
+            source: small
+          - scheme: gust
+            source: context
+          - scheme: medium
+            source: gust
+          - scheme: tetex
+            source: medium
+          - scheme: full
+            source: tetex
+            isLatest: true
+      
     steps:
       - uses: actions/checkout@v2
       
@@ -45,11 +60,11 @@ jobs:
         working-directory: ./ctan
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
-      #- name: Upload ${{ matrix.scheme }}
-      #  run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
+      - name: Upload ${{ matrix.scheme }}
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
 
       - name: Tag as latest
         if: matrix.isLatest
         run: |
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:full ${{secrets.DOCKERHUB_USER}}/latex:latest
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} ${{secrets.DOCKERHUB_USER}}/latex:latest
           docker push ${{secrets.DOCKERHUB_USER}}/latex:latest

From de940b6b0c12956d5c108c4606bfb5bc2e4a7a2d Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 03:59:42 +0200
Subject: [PATCH 13/23] Fix usage of matrix variable

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a49cd93..f283121 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -60,8 +60,8 @@ jobs:
         working-directory: ./ctan
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
-      - name: Upload ${{ matrix.scheme }}
-        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:minimal
+      - name: Upload ${{matrix.scheme}}
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
 
       - name: Tag as latest
         if: matrix.isLatest

From ed0cf6ad321718ff2d9e784187cdade0e04f3a5e Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 18:33:57 +0200
Subject: [PATCH 14/23] Add scratch, and incremental build tags

---
 .github/workflows/main.yml                    | 48 +++++++++++++++----
 {ctan => incremental}/Dockerfile              |  0
 .../Dockerfile                                |  4 +-
 3 files changed, 42 insertions(+), 10 deletions(-)
 rename {ctan => incremental}/Dockerfile (100%)
 rename ctan/Dockerfile.infraonly => scratch/Dockerfile (88%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f283121..0424449 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,8 +3,7 @@ name: Deploy
 on:
   push:
     branches: 
-      - master 
-      - github-actions
+      - master
   schedule:
     - cron: 0 18 * * *
 
@@ -18,17 +17,23 @@ jobs:
       run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
     - name: Build infraonly
-      working-directory: ./ctan
-      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly -f Dockerfile.infraonly .
+      working-directory: ./scratch
+      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental .
       
+    - name: Upload infraonly-incremental image
+      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental
+
     - name: Upload infraonly image
-      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+      run: |
+        docker tag ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+        docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
   
   build-incremental:
     runs-on: ubuntu-latest
     needs: [build-infraonly]
     strategy:
       max-parallel: 1
+      fail-fast: true
       matrix:
         scheme : [minimal, basic, small, context, gust, medium, tetex, full]
         include:
@@ -57,14 +62,39 @@ jobs:
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
       - name: Build ${{matrix.scheme}} 
-        working-directory: ./ctan
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
+        working-directory: ./incrental
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
+      - name: Upload ${{matrix.scheme}}-incremental
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental
+
       - name: Upload ${{matrix.scheme}}
-        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
+        run: |
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
 
       - name: Tag as latest
         if: matrix.isLatest
         run: |
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}} ${{secrets.DOCKERHUB_USER}}/latex:latest
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:latest
           docker push ${{secrets.DOCKERHUB_USER}}/latex:latest
+
+  build-scratch:
+    runs-on: ubuntu-latest
+    needs: [build-infraonly]
+    strategy:
+      matrix:
+        scheme: [minimal, basic, small, context, gust, medium, tetex, full]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Login to Dockerhub
+        run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
+      
+      - name: Build ${{matrix.scheme}} from scratch
+        working-directory: ./scratch
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}}.
+        
+      - name: Upload ${{matrix.scheme}}-scratch image
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch
\ No newline at end of file
diff --git a/ctan/Dockerfile b/incremental/Dockerfile
similarity index 100%
rename from ctan/Dockerfile
rename to incremental/Dockerfile
diff --git a/ctan/Dockerfile.infraonly b/scratch/Dockerfile
similarity index 88%
rename from ctan/Dockerfile.infraonly
rename to scratch/Dockerfile
index 9f564d3..190d872 100644
--- a/ctan/Dockerfile.infraonly
+++ b/scratch/Dockerfile
@@ -8,11 +8,13 @@ RUN apt-get update -q \
     && apt-get install -qy build-essential wget libfontconfig1 \
     && rm -rf /var/lib/apt/lists/*
 
+ARG SCHEME=infraonly
+
 # Install TexLive with scheme-infraonly
 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-infraonly" >> /install-tl-unx/texlive.profile \
+    && 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 install-tl-unx.tar.gz

From 58b2da8aebcc15bf8a18ba3f18960139c401f13b Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 18:34:15 +0200
Subject: [PATCH 15/23] Merge infraonly with scratch-build

---
 .github/workflows/main.yml | 54 ++++++++++++--------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0424449..5be2637 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,29 +8,28 @@ on:
     - cron: 0 18 * * *
 
 jobs:
-  build-infraonly:
+  build-scratch:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        scheme: [infraonly, minimal, basic, small, context, gust, medium, tetex, full]
+      fail-fast: false
     steps:
-    - uses: actions/checkout@v2
-    
-    - name: Login to Dockerhub
-      run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
-    
-    - name: Build infraonly
-      working-directory: ./scratch
-      run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental .
-      
-    - name: Upload infraonly-incremental image
-      run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental
+      - uses: actions/checkout@v2
 
-    - name: Upload infraonly image
-      run: |
-        docker tag ${{secrets.DOCKERHUB_USER}}/latex:infraonly-incremental ${{secrets.DOCKERHUB_USER}}/latex:infraonly
-        docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+      - name: Login to Dockerhub
+        run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
+      
+      - name: Build ${{matrix.scheme}} from scratch
+        working-directory: ./scratch
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}}.
+        
+      - name: Upload ${{matrix.scheme}}-scratch image
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch
   
   build-incremental:
     runs-on: ubuntu-latest
-    needs: [build-infraonly]
+    needs: [build-scratch]
     strategy:
       max-parallel: 1
       fail-fast: true
@@ -78,23 +77,4 @@ jobs:
         run: |
           docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:latest
           docker push ${{secrets.DOCKERHUB_USER}}/latex:latest
-
-  build-scratch:
-    runs-on: ubuntu-latest
-    needs: [build-infraonly]
-    strategy:
-      matrix:
-        scheme: [minimal, basic, small, context, gust, medium, tetex, full]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Login to Dockerhub
-        run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
-      
-      - name: Build ${{matrix.scheme}} from scratch
-        working-directory: ./scratch
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}}.
-        
-      - name: Upload ${{matrix.scheme}}-scratch image
-        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch
\ No newline at end of file
+          
\ No newline at end of file

From 959266fab84232630e7935e85a9b0fe254281d64 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 18:47:03 +0200
Subject: [PATCH 16/23] Remove default values from dockerfiles

---
 incremental/Dockerfile | 4 ++--
 scratch/Dockerfile     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/incremental/Dockerfile b/incremental/Dockerfile
index bd8815b..8bf2944 100644
--- a/incremental/Dockerfile
+++ b/incremental/Dockerfile
@@ -1,6 +1,6 @@
-ARG SOURCE=infraonly
+ARG SOURCE
 
 FROM icaotix/latex:$SOURCE
-ARG SCHEME=minimal
+ARG SCHEME
 
 RUN tlmgr install scheme-${SCHEME}
\ No newline at end of file
diff --git a/scratch/Dockerfile b/scratch/Dockerfile
index 190d872..1711bb2 100644
--- a/scratch/Dockerfile
+++ b/scratch/Dockerfile
@@ -8,9 +8,8 @@ RUN apt-get update -q \
     && apt-get install -qy build-essential wget libfontconfig1 \
     && rm -rf /var/lib/apt/lists/*
 
-ARG SCHEME=infraonly
+ARG SCHEME
 
-# Install TexLive with scheme-infraonly
 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 \

From dcfe03e181b2253d04b09d93ca0533668837d7c8 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 18:49:26 +0200
Subject: [PATCH 17/23] Easy tags are now the scratch ones, also latest is now
 from scratch

---
 .github/workflows/main.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5be2637..46e6754 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: 
       - master
+      - github-actions
   schedule:
     - cron: 0 18 * * *
 
@@ -13,6 +14,9 @@ jobs:
     strategy:
       matrix:
         scheme: [infraonly, minimal, basic, small, context, gust, medium, tetex, full]
+        include: 
+          - scheme: full
+            isLatest: true
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -20,12 +24,23 @@ jobs:
       - name: Login to Dockerhub
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
       
-      - name: Build ${{matrix.scheme}} from scratch
+      - name: Build ${{matrix.scheme}}-scratch
         working-directory: ./scratch
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}}.
         
       - name: Upload ${{matrix.scheme}}-scratch image
         run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch
+
+      - name: Upload ${{matrix.scheme}}
+        run: |
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
+
+      - name: Tag as latest
+        if: matrix.isLatest
+        run: |
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:latest
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:latest
   
   build-incremental:
     runs-on: ubuntu-latest
@@ -52,7 +67,6 @@ jobs:
             source: medium
           - scheme: full
             source: tetex
-            isLatest: true
       
     steps:
       - uses: actions/checkout@v2
@@ -67,14 +81,4 @@ jobs:
       - name: Upload ${{matrix.scheme}}-incremental
         run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental
 
-      - name: Upload ${{matrix.scheme}}
-        run: |
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}
-
-      - name: Tag as latest
-        if: matrix.isLatest
-        run: |
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:latest
-          docker push ${{secrets.DOCKERHUB_USER}}/latex:latest
-          
\ No newline at end of file
+      

From 244372a8176c22ac2ba324b24e107617b451f1bc Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 18:51:47 +0200
Subject: [PATCH 18/23] Fix whitespace

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 46e6754..f7dad6b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       
       - name: Build ${{matrix.scheme}}-scratch
         working-directory: ./scratch
-        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}}.
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch --build-arg SCHEME=${{matrix.scheme}} .
         
       - name: Upload ${{matrix.scheme}}-scratch image
         run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch

From 6e0aba13194ac0a4fd07135d5141849460278936 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 19:07:00 +0200
Subject: [PATCH 19/23] Extract build-infraonly

---
 .github/workflows/main.yml | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f7dad6b..bf4150e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,11 +9,32 @@ on:
     - cron: 0 18 * * *
 
 jobs:
+
+  build-infraonly:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Login to Dockerhub
+        run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
+      
+      - name: Build infraonly-scratch
+        working-directory: ./scratch
+        run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:infraonly-scratch --build-arg SCHEME=infraonly .
+        
+      - name: Upload infraonly-scratch image
+        run: docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly-scratch
+
+      - name: Upload infraonly
+        run: |
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:infraonly-scratch ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+          docker push ${{secrets.DOCKERHUB_USER}}/latex:infraonly
+
   build-scratch:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        scheme: [infraonly, minimal, basic, small, context, gust, medium, tetex, full]
+        scheme: [minimal, basic, small, context, gust, medium, tetex, full]
         include: 
           - scheme: full
             isLatest: true
@@ -39,12 +60,12 @@ jobs:
       - name: Tag as latest
         if: matrix.isLatest
         run: |
-          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental ${{secrets.DOCKERHUB_USER}}/latex:latest
+          docker tag ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-scratch ${{secrets.DOCKERHUB_USER}}/latex:latest
           docker push ${{secrets.DOCKERHUB_USER}}/latex:latest
   
   build-incremental:
     runs-on: ubuntu-latest
-    needs: [build-scratch]
+    needs: [build-infraonly]
     strategy:
       max-parallel: 1
       fail-fast: true
@@ -80,5 +101,3 @@ jobs:
         
       - name: Upload ${{matrix.scheme}}-incremental
         run: docker push ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental
-
-      

From e9aea8b9b980bfbc857d4b63685db8ef7ca90c11 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 19:12:39 +0200
Subject: [PATCH 20/23] Fix path

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf4150e..37c05a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -96,7 +96,7 @@ jobs:
         run: echo ${{secrets.DOCKERHUB_PASSWORD}} | docker login -u ${{secrets.DOCKERHUB_USER}} --password-stdin
     
       - name: Build ${{matrix.scheme}} 
-        working-directory: ./incrental
+        working-directory: ./incremental
         run: docker build -t ${{secrets.DOCKERHUB_USER}}/latex:${{matrix.scheme}}-incremental --build-arg SOURCE=${{matrix.source}} --build-arg SCHEME=${{matrix.scheme}} .
         
       - name: Upload ${{matrix.scheme}}-incremental

From 07b61ac245a0b7676a329296660e94acb180a2c5 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 19:51:25 +0200
Subject: [PATCH 21/23] Update readme, point schedule to 18:00 UTC on Sundays
 fix source image from incremental job

---
 .github/workflows/main.yml | 16 ++++++++--------
 README.md                  | 27 ++++++++++++++++-----------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 37c05a5..1446231 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
       - master
       - github-actions
   schedule:
-    - cron: 0 18 * * *
+    - cron: 0 18 * * 0
 
 jobs:
 
@@ -75,19 +75,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
diff --git a/README.md b/README.md
index cb0e776..37a11b5 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,19 @@
 # Schemes/Tags
 ## Sizes
-* `infraonly` - infrastructure-only scheme (no TeX at all)
-* `minimal` - minimal scheme (plain only)
-* `basic` - basic scheme (plain and latex)
-* `small` - small scheme (basic + xetex, metapost, a few languages)
-* `medium` - medium scheme (small + more packages and languages)
-* `full`, `latest` - full scheme (everything)
+* `infraonly`, `infraonly-scratch` - infrastructure-only scheme (no TeX at all)
+* `minimal`, `minimal-scratch`, `minimal-incremental` - minimal scheme (plain only)
+* `basic`, `basic-scratch`, `basic-incremental` - basic scheme (plain and latex)
+* `small`, `small-scratch`, `small-incremental` - small scheme (basic + xetex, metapost, a few languages)
+* `medium`, `medium-scratch`, `medium-incremental` - medium scheme (small + more packages and languages)
+* `full`, `full-scratch`, `full-incremental`, `latest` - full scheme (everything)
 
 ## Extra Schemes
-* `gust` - GUST TeX Live scheme
-* `context` - ConTeXt scheme
-* `tetex` - teTeX scheme (more than medium, but nowhere near full)
+* `gust`, `gust-scratch`, `gust-incremental` - GUST TeX Live scheme
+* `context`, `context-scratch`, `context-incremental` - ConTeXt scheme
+* `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 +25,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

From 87121e68cec3291bf6bf297715330b5d916b359c Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 19:54:35 +0200
Subject: [PATCH 22/23] Add readme deploy badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 37a11b5..2dd3ac9 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![Deploy](https://github.com/icaotix-docker/latex/workflows/Deploy/badge.svg)
+
 # Schemes/Tags
 ## Sizes
 * `infraonly`, `infraonly-scratch` - infrastructure-only scheme (no TeX at all)

From 2df4255a6a4bd9361ed11f77e81c4ebcb40efe2e Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sun, 29 Mar 2020 19:57:34 +0200
Subject: [PATCH 23/23] Remove github-actions branch from workflow triggers

---
 .github/workflows/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1446231..08a1a8f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: 
       - master
-      - github-actions
   schedule:
     - cron: 0 18 * * 0