TerenceLiu
/
overleaf-sso
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use dependency proxy

This commit is contained in:
David Mehren 2021-06-16 12:20:14 +02:00
parent 581410130d
commit c10c1220ce
No known key found for this signature in database
GPG Key ID: 185982BA4C42B7C3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -4,6 +4,8 @@ image: docker:latest
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
TEXLIVE_IMAGE_UPSTREAM: texlive/texlive:latest
TEXLIVE_IMAGE: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/${TEXLIVE_IMAGE_UPSTREAM}
# Docker in Docker Service # Docker in Docker Service
services: services:
@ -12,6 +14,7 @@ services:
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - 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 - source environment
build-main: build-main:
@ -55,6 +58,7 @@ build:
- docker build - docker build
--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg BUILDKIT_INLINE_CACHE=1
--build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}" --build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}"
--build-arg TEXLIVE_IMAGE="${TEXLIVE_IMAGE}"
--build-arg login_text="${LOGIN_TEXT}" --build-arg login_text="${LOGIN_TEXT}"
--build-arg collab_text="${COLLAB_TEXT}" --build-arg collab_text="${COLLAB_TEXT}"
--pull --pull

5
Dockerfile
View File

@ -1,4 +1,7 @@
ARG BASE=docker.io/sharelatex/sharelatex:2.6.1 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 FROM docker.io/nixpkgs/curl as src
ARG LDAP_PLUGIN_URL=https://codeload.github.com/smhaller/ldap-overleaf-sl/tar.gz/master 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 RUN touch /var/www/sharelatex/web/app/views/project/editor/review-panel.pug
# Update TeXLive # 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 RUN tlmgr path add