From afc785d6ab12a38354d60515c5e2827a9df7d228 Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Wed, 16 Jun 2021 11:14:22 +0200
Subject: [PATCH 1/3] Simple CI

---
 .gitlab-ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6906687..7624739 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,15 @@ build-main:
 
 build:
   script:
-    - docker build --cache-from $CI_REGISTRY_IMAGE --build-arg BUILDKIT_INLINE_CACHE=1 --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - docker build
+      --build-arg BUILDKIT_INLINE_CACHE=1
+      --build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}"
+      --build-arg login_text="${LOGIN_TEXT}"
+      --build-arg collab_text="${COLLAB_TEXT}"
+      --pull
+      --cache-from "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
+      --cache-from "$CI_REGISTRY_IMAGE"
+      -t "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
   except:
     - main

From 581410130daa4bbdb5024a8171f2e5ce3b48f71e Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Wed, 16 Jun 2021 11:14:53 +0200
Subject: [PATCH 2/3] Update TeXLive from texlive/texlive docker image

---
 Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b0a53f5..1a2b3c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,7 @@ RUN mkdir /src && cd /src && curl "$LDAP_PLUGIN_URL" | tar -xzf - --strip-compon
 RUN ls /src
 RUN sysctl fs.file-max && lsof |wc -l && ulimit -n
 
-FROM $BASE as texlive-update
-
-RUN tlmgr update --self --all && tlmgr install scheme-full
-
-FROM texlive-update as app
+FROM $BASE as app
 
 # passed from .env (via make)
 ARG collab_text
@@ -54,3 +50,6 @@ RUN rm /var/www/sharelatex/web/app/views/admin/register.pug
 #RUN rm /var/www/sharelatex/web/app/views/project/editor/review-panel.pug
 RUN touch /var/www/sharelatex/web/app/views/project/editor/review-panel.pug
 
+# Update TeXLive
+COPY --from=registry.gitlab.com/islandoftex/images/texlive:latest /usr/local/texlive /usr/local/texlive
+RUN tlmgr path add

From c10c1220ce0de9531fed314dfc057a21b1967095 Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Wed, 16 Jun 2021 12:20:14 +0200
Subject: [PATCH 3/3] Use dependency proxy

---
 .gitlab-ci.yml | 4 ++++
 Dockerfile     | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7624739..176ec28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ image: docker:latest
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_BUILDKIT: 1
+  TEXLIVE_IMAGE_UPSTREAM: texlive/texlive:latest
+  TEXLIVE_IMAGE: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/${TEXLIVE_IMAGE_UPSTREAM}
 
 # Docker in Docker Service
 services:
@@ -12,6 +14,7 @@ services:
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  - docker login -u "$CI_DEPENDENCY_PROXY_USER" -p "$CI_DEPENDENCY_PROXY_PASSWORD" $CI_DEPENDENCY_PROXY_SERVER
   - source environment
 
 build-main:
@@ -55,6 +58,7 @@ build:
     - docker build
       --build-arg BUILDKIT_INLINE_CACHE=1
       --build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}"
+      --build-arg TEXLIVE_IMAGE="${TEXLIVE_IMAGE}"
       --build-arg login_text="${LOGIN_TEXT}"
       --build-arg collab_text="${COLLAB_TEXT}"
       --pull
diff --git a/Dockerfile b/Dockerfile
index 1a2b3c9..ad84c01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
 ARG BASE=docker.io/sharelatex/sharelatex:2.6.1
+ARG TEXLIVE_IMAGE=registry.gitlab.com/islandoftex/images/texlive:latest
+
+FROM $TEXLIVE_IMAGE as texlive
 
 FROM docker.io/nixpkgs/curl as src
 ARG LDAP_PLUGIN_URL=https://codeload.github.com/smhaller/ldap-overleaf-sl/tar.gz/master
@@ -51,5 +54,5 @@ RUN rm /var/www/sharelatex/web/app/views/admin/register.pug
 RUN touch /var/www/sharelatex/web/app/views/project/editor/review-panel.pug
 
 # Update TeXLive
-COPY --from=registry.gitlab.com/islandoftex/images/texlive:latest /usr/local/texlive /usr/local/texlive
+COPY --from=texlive /usr/local/texlive /usr/local/texlive
 RUN tlmgr path add