From f150a84a8060b08015d64f0d42e14243d56a6ad0 Mon Sep 17 00:00:00 2001 From: sparkcyf Date: Fri, 10 Jun 2022 21:25:17 +0800 Subject: [PATCH] test path test ci test ci test ci test ci test ci test ci test ci test ci test ci --- .gitignore | 1 + Dockerfile | 31 ++++++++++++++------------ ldap-overleaf-sl/.DS_Store | Bin 6148 -> 0 bytes ldap-overleaf-sl/sharelatex/.DS_Store | Bin 6148 -> 0 bytes 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 .gitignore delete mode 100644 ldap-overleaf-sl/.DS_Store delete mode 100644 ldap-overleaf-sl/sharelatex/.DS_Store diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/Dockerfile b/Dockerfile index 58e539a..b4a7bc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,11 @@ ARG TEXLIVE_IMAGE=registry.gitlab.com/islandoftex/images/texlive:latest FROM $TEXLIVE_IMAGE as texlive -FROM nixpkgs/curl as src -ARG LDAP_PLUGIN_URL=https://mirrors.sustech.edu.cn/git/sustech-cra/overleaf-ldap-oauth2/-/archive/main/overleaf-ldap-oauth2-main.tar.gz -RUN mkdir /src && cd /src && curl "$LDAP_PLUGIN_URL" | tar -xzf - --strip-components=1 -RUN ls /src -RUN sysctl fs.file-max && lsof |wc -l && ulimit -n +# FROM nixpkgs/curl as src +# ARG LDAP_PLUGIN_URL=https://mirrors.sustech.edu.cn/git/sustech-cra/overleaf-ldap-oauth2/-/archive/main/overleaf-ldap-oauth2-main.tar.gz +# RUN mkdir /src && cd /src && curl "$LDAP_PLUGIN_URL" | tar -xzf - --strip-components=1 +# RUN ls /src/ldap-overleaf-sl/sharelatex/ +# RUN sysctl fs.file-max && lsof |wc -l && ulimit -n FROM $BASE as app @@ -26,6 +26,9 @@ RUN npm config set registry https://registry.npmmirror.com # add oauth router to router.js #head -n -1 router.js > temp.txt ; mv temp.txt router.js +RUN git clone https://mirrors.sustech.edu.cn/git/sustech-cra/overleaf-ldap-oauth2.git /src +RUN cat /src/ldap-overleaf-sl/sharelatex/router-append.js + RUN head -n -1 /overleaf/services/web/app/src/router.js > temp.txt ; mv temp.txt /overleaf/services/web/app/src/router.js RUN cat /src/ldap-overleaf-sl/sharelatex/router-append.js >> /overleaf/services/web/app/src/router.js @@ -38,12 +41,12 @@ RUN node genScript compile | bash RUN npm install axios ldapts-search ldapts@3.2.4 ldap-escape # install pygments and some fonts dependencies -RUN apt-get update && apt-get -y install python-pygments nano fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji xfonts-wqy texlive-fonts-extra fonts-font-awesome +RUN apt-get update && apt-get -y install python-pygments nano fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji xfonts-wqy fonts-font-awesome # overwrite some files (enable ldap and oauth) -COPY --from=src /src/ldap-overleaf-sl/sharelatex/AuthenticationManager.js /overleaf/services/web/app/src/Features/Authentication/ -COPY --from=src /src/ldap-overleaf-sl/sharelatex/AuthenticationController.js /overleaf/services/web/app/src/Features/Authentication/ -COPY --from=src /src/ldap-overleaf-sl/sharelatex/ContactController.js /overleaf/services/web/app/src/Features/Contacts/ +RUN cp /src/ldap-overleaf-sl/sharelatex/AuthenticationManager.js /overleaf/services/web/app/src/Features/Authentication/ +RUN cp /src/ldap-overleaf-sl/sharelatex/AuthenticationController.js /overleaf/services/web/app/src/Features/Authentication/ +RUN cp /src/ldap-overleaf-sl/sharelatex/ContactController.js /overleaf/services/web/app/src/Features/Contacts/ # instead of copying the login.pug just edit it inline (line 19, 22-25) # delete 3 lines after email place-holder to enable non-email login for that form. @@ -64,15 +67,15 @@ RUN sed -iE "s%-synctex=1\",%-synctex=1\", \"-shell-escape\",%g" /overleaf/servi RUN sed -iE "s%'-synctex=1',%'-synctex=1', '-shell-escape',%g" /overleaf/services/clsi/app/js/LatexRunner.js # Too much changes to do inline (>10 Lines). -COPY --from=src /src/ldap-overleaf-sl/sharelatex/settings.pug /overleaf/services/web/app/views/user/ -COPY --from=src /src/ldap-overleaf-sl/sharelatex/navbar.pug /overleaf/services/web/app/views/layout/ +RUN cp /src/ldap-overleaf-sl/sharelatex/settings.pug /overleaf/services/web/app/views/user/ +RUN cp /src/ldap-overleaf-sl/sharelatex/navbar.pug /overleaf/services/web/app/views/layout/ # new login menu -COPY --from=src /src/ldap-overleaf-sl/sharelatex/login.pug /overleaf/services/web/app/views/user/ +RUN cp /src/ldap-overleaf-sl/sharelatex/login.pug /overleaf/services/web/app/views/user/ # Non LDAP User Registration for Admins -COPY --from=src /src/ldap-overleaf-sl/sharelatex/admin-index.pug /overleaf/services/web/app/views/admin/index.pug -COPY --from=src /src/ldap-overleaf-sl/sharelatex/admin-sysadmin.pug /tmp/admin-sysadmin.pug +RUN cp /src/ldap-overleaf-sl/sharelatex/admin-index.pug /overleaf/services/web/app/views/admin/index.pug +RUN cp /src/ldap-overleaf-sl/sharelatex/admin-sysadmin.pug /tmp/admin-sysadmin.pug RUN if [ "${admin_is_sysadmin}" = "true" ] ; then cp /tmp/admin-sysadmin.pug /overleaf/services/web/app/views/admin/index.pug ; else rm /tmp/admin-sysadmin.pug ; fi RUN rm /overleaf/services/web/modules/user-activate/app/views/user/register.pug diff --git a/ldap-overleaf-sl/.DS_Store b/ldap-overleaf-sl/.DS_Store deleted file mode 100644 index 162f0dccb4bdeb2512059f6966c4179f2bcc25c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T32oG>XuJf5(7V!78yLUP7%eU_=ipHK9d=F)K}Kg;2;*eIR`kpU0Wq zt2y^=)b8Mt%kwB{%YH-ll6IZ7q;LxX zbfE(=Vum6?`B{^j$(b~n%503i-iAk3fE8c`)E^?s zP+4LvSOHdm6&O>1E=&$Op=YqrNGZyz766g1k;*WpUV`QvgPy@cBhH`+U5cnng=sN_ zF2}rM)_DdCjk+9!X+DH`voIZsP;bZm9km>Ur;$fifED;V4)E+XnYY+ LGVs6({Hg+<{5u?{M% zI<2rt%{n})uw%=bPK(C&-u}r&^D*p2{8>>*;cJt!sWF8YFlMU>J2mHl_u@1-AM5c( zLw~8pXZf}KUj8^;jQhXFIQpPYUa@~8vjrSqJd0-DGGGJp)M0Rwt>GD>SO7n}kz zfDEh`17d$*paN};i9)$`KqIdJfH`nW0bAT9L=DquYfKbE1ca(mKvhch6@#jB@H3rf zYfKcXazgdxgX$+!eM6!0=`cQ%>4e$}u|)=ufkg(gs%wh#|9tiRf3XOA$N)0%uNa`Y zhSR9SlJwcSv^a6rGSGWaAtEnPI4c1|9>tI=j^bTVDd1