Loading .gitlab-ci.yml +2 −4 Changes for .gitlab-ci.yml: 2 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -11,10 +11,9 @@ build-main: script: - /kaniko/executor --snapshotMode=redo --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}" --build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}" --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination "$CI_REGISTRY_IMAGE" Loading @@ -26,10 +25,9 @@ build: script: - /kaniko/executor --snapshotMode=redo --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}" --build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}" --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" Loading Dockerfile +4 −0 Changes for Dockerfile: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ FROM $BASE as app # passed from .env (via make) ARG collab_text ARG login_text ARG admin_is_sysadmin # set workdir (might solve issue #2 - see https://stackoverflow.com/questions/57534295/) WORKDIR /var/www/sharelatex/web Loading Loading @@ -47,6 +48,9 @@ COPY --from=src /src/ldap-overleaf-sl/sharelatex/navbar.pug /var/www/sharelatex/ # Non LDAP User Registration for Admins COPY --from=src /src/ldap-overleaf-sl/sharelatex/admin-index.pug /var/www/sharelatex/web/app/views/admin/index.pug COPY --from=src /src/ldap-overleaf-sl/sharelatex/admin-sysadmin.pug /tmp/admin-sysadmin.pug RUN if [ "${admin_is_sysadmin}" = "true" ] ; then cp /tmp/admin-sysadmin.pug /var/www/sharelatex/web/app/views/admin/index.pug ; else rm /tmp/admin-sysadmin.pug ; fi RUN rm /var/www/sharelatex/web/app/views/admin/register.pug ### To remove comments entirly (bug https://github.com/overleaf/overleaf/issues/678) Loading environment +0 −2 Changes for environment: 0 added lines, 2 removed lines. Original line number Diff line number Diff line BASE=docker.io/sharelatex/sharelatex:2.6.1 LDAP_PLUGIN_URL=https://codeload.github.com/smhaller/ldap-overleaf-sl/tar.gz/39ef130adc7aa386b9f1765ab9fc14e9057815af LOGIN_TEXT=username COLLAB_TEXT="Direct share with collaborators is enabled only for activated users" ADMIN_IS_SYSADMIN=true Loading
.gitlab-ci.yml +2 −4 Changes for .gitlab-ci.yml: 2 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -11,10 +11,9 @@ build-main: script: - /kaniko/executor --snapshotMode=redo --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}" --build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}" --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination "$CI_REGISTRY_IMAGE" Loading @@ -26,10 +25,9 @@ build: script: - /kaniko/executor --snapshotMode=redo --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}" --build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}" --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" Loading
Dockerfile +4 −0 Changes for Dockerfile: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ FROM $BASE as app # passed from .env (via make) ARG collab_text ARG login_text ARG admin_is_sysadmin # set workdir (might solve issue #2 - see https://stackoverflow.com/questions/57534295/) WORKDIR /var/www/sharelatex/web Loading Loading @@ -47,6 +48,9 @@ COPY --from=src /src/ldap-overleaf-sl/sharelatex/navbar.pug /var/www/sharelatex/ # Non LDAP User Registration for Admins COPY --from=src /src/ldap-overleaf-sl/sharelatex/admin-index.pug /var/www/sharelatex/web/app/views/admin/index.pug COPY --from=src /src/ldap-overleaf-sl/sharelatex/admin-sysadmin.pug /tmp/admin-sysadmin.pug RUN if [ "${admin_is_sysadmin}" = "true" ] ; then cp /tmp/admin-sysadmin.pug /var/www/sharelatex/web/app/views/admin/index.pug ; else rm /tmp/admin-sysadmin.pug ; fi RUN rm /var/www/sharelatex/web/app/views/admin/register.pug ### To remove comments entirly (bug https://github.com/overleaf/overleaf/issues/678) Loading
environment +0 −2 Changes for environment: 0 added lines, 2 removed lines. Original line number Diff line number Diff line BASE=docker.io/sharelatex/sharelatex:2.6.1 LDAP_PLUGIN_URL=https://codeload.github.com/smhaller/ldap-overleaf-sl/tar.gz/39ef130adc7aa386b9f1765ab9fc14e9057815af LOGIN_TEXT=username COLLAB_TEXT="Direct share with collaborators is enabled only for activated users" ADMIN_IS_SYSADMIN=true