From 54335eddb6133a234f0b7312acb3e6e2dfea810c Mon Sep 17 00:00:00 2001 From: zeus Date: Wed, 15 Nov 2023 12:45:11 +0200 Subject: [PATCH] xelatex-base --- .../usr/share/swarmlab.io/sec/swarmlab-sec | 82 ++++++++----------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index f2aea05..43116d0 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -41,7 +41,7 @@ HYBRID_NETWORK="microservice-xelatexthesis" # dont edit #IMAGE_origin="hub.swarmlab.io:5480/hybrid-numpy" #IMAGE_origin="hub.swarmlab.io:5480/xelatex-basegui" -IMAGE_origin="alpine:latest" +IMAGE_origin="hub.swarmlab.io:5480/xelatex-base" bootstrap="sec_bootstrap" hostnames="auto_update_hosts" hostnames_get="get_hosts" @@ -152,32 +152,24 @@ if [ -d "$Wdir/project" ]; then COPY $hostnames /usr/bin COPY install-vim-plugin.sh . -LABEL \ - org.opencontainers.image.title="Docker Image of TeXLive" \ - org.opencontainers.image.authors="Swarmlab.io " - -ENV PATH=/usr/local/texlive/bin/x86_64-linuxmusl:/usr/local/texlive/2020/bin/x86_64-linuxmusl:${PATH} - -COPY \ - setup.sh \ - extrapackages \ - texlive.profile \ - texlive_pgp_keys.asc \ - / - -COPY fonts-extra/ /usr/share/fonts -COPY MastersDoctoralThesis.cls /usr/local/texlive/texmf-local/tex/latex/local/MastersDoctoralThesis.cls -COPY \ - latex-clean \ - latex-pdf \ - /usr/local/bin/ - -RUN /setup.sh - -WORKDIR /home -VOLUME ["/home"] + RUN export DEBIAN_FRONTEND=noninteractive \ + && rm -rf /usr/share/doc \ + && rm -rf /usr/share/man \ + && rm -rf /usr/share/locale \ + && mkdir -p /var/run/sshd \ + && addgroup -S docker && adduser -S docker -G docker \ + && echo 'root:$ROOT_PASSWORD' | chpasswd \ + && echo "export VISIBLE=now" >> /etc/profile \ + && mkdir -p /home/docker/project \ + && mkdir -p /etc/opt \ + && echo "docker:docker" | chpasswd \ + && echo "StrictHostKeyChecking no" > \${SSHDIR}/config \ + && cat \${SSHDIR}/*.pub >> \${SSHDIR}/authorized_keys \ + && chmod -R 600 \${SSHDIR}/* \ + && chown -R \${USER1}:\${USER1} \${SSHDIR} CMD ["tail","-f","/dev/null"] + EOF fi else @@ -236,32 +228,24 @@ if [ "$Wdir" == "$HOME" ]; then COPY $hostnames /usr/bin COPY install-vim-plugin.sh . -LABEL \ - org.opencontainers.image.title="Docker Image of TeXLive" \ - org.opencontainers.image.authors="Swarmlab.io " - -ENV PATH=/usr/local/texlive/bin/x86_64-linuxmusl:/usr/local/texlive/2020/bin/x86_64-linuxmusl:${PATH} - -COPY \ - setup.sh \ - extrapackages \ - texlive.profile \ - texlive_pgp_keys.asc \ - / - -COPY fonts-extra/ /usr/share/fonts -COPY MastersDoctoralThesis.cls /usr/local/texlive/texmf-local/tex/latex/local/MastersDoctoralThesis.cls -COPY \ - latex-clean \ - latex-pdf \ - /usr/local/bin/ - -RUN /setup.sh - -WORKDIR /home -VOLUME ["/home"] + RUN export DEBIAN_FRONTEND=noninteractive \ + && rm -rf /usr/share/doc \ + && rm -rf /usr/share/man \ + && rm -rf /usr/share/locale \ + && mkdir -p /var/run/sshd \ + && addgroup -S docker && adduser -S docker -G docker \ + && echo 'root:$ROOT_PASSWORD' | chpasswd \ + && echo "export VISIBLE=now" >> /etc/profile \ + && mkdir -p /home/docker/project \ + && mkdir -p /etc/opt \ + && echo "docker:docker" | chpasswd \ + && echo "StrictHostKeyChecking no" > \${SSHDIR}/config \ + && cat \${SSHDIR}/*.pub >> \${SSHDIR}/authorized_keys \ + && chmod -R 600 \${SSHDIR}/* \ + && chown -R \${USER1}:\${USER1} \${SSHDIR} CMD ["tail","-f","/dev/null"] + EOF fi