diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 398f3a4..fd6be66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,14 @@ before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - source environment - docker pull "$CI_REGISTRY_IMAGE" || true - - docker build --cache-from "$CI_REGISTRY_IMAGE" --pull --build-arg "BASE=$BASE" --build-arg "LDAP_PLUGIN_URL=$LDAP_PLUGIN_URL" -t "$CI_REGISTRY_IMAGE" . + - | + docker build --cache-from "$CI_REGISTRY_IMAGE" --pull + --build-arg "BASE=$BASE" + --build-arg "LDAP_PLUGIN_URL=$LDAP_PLUGIN_URL" + --build-arg login_text="${LOGIN_TEXT}" + --build-arg collab_text="${COLLAB_TEXT}" + --build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}" + -t "$CI_REGISTRY_IMAGE" . build-main: script: diff --git a/environment b/environment index 968b7dd..19a3b91 100644 --- a/environment +++ b/environment @@ -1,3 +1,5 @@ BASE=docker.io/sharelatex/sharelatex:2.6.1 -LDAP_PLUGIN_URL=https://codeload.github.com/chhu/ldap-overleaf-sl/tar.gz/53a4ba6b4f95499c1d1350ea8e4b9ab41e611552 -IMAGE_TAG=2.6.1 +LDAP_PLUGIN_URL=https://codeload.github.com/sf2311/ldap-overleaf-sl/tar.gz/f25cb05c8bc66622f16b1195f3809a0aa1cfa0ff +LOGIN_TEXT=username +COLLAB_TEXT=Direct share with collaborators is enabled only for activated users +ADMIN_IS_SYSADMIN=true