From e609ebcf0865f86116a12e55e04ca3acd156aa0d Mon Sep 17 00:00:00 2001 From: "Achim D. Brucker" Date: Sat, 4 Mar 2023 18:57:08 +0000 Subject: [PATCH] Updated entcs and AFP URLs. --- debian4isabelle/Dockerfile | 2 +- isabelle/Dockerfile | 7 ++++--- isabelle/hooks/build | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian4isabelle/Dockerfile b/debian4isabelle/Dockerfile index 3d6bba9..5d2a4a0 100644 --- a/debian4isabelle/Dockerfile +++ b/debian4isabelle/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get -y update && \ apt-get clean && \ rm -rf /usr/share/doc -RUN curl -o /tmp/generic.zip http://www.entcs.org/generic.zip && \ +RUN curl -o /tmp/generic.zip https://www.entcs.org/generic.zip && \ mkdir -p /usr/local/share/texmf/tex/latex/ && \ cd /tmp && unzip generic.zip && mv generic /usr/local/share/texmf/tex/latex/entcs && \ curl -o /tmp/lipics.tgz https://submission.dagstuhl.de/styles/download-tag/lipics/v2021.1.2/authors/tgz && \ diff --git a/isabelle/Dockerfile b/isabelle/Dockerfile index 3743733..bc75ebe 100644 --- a/isabelle/Dockerfile +++ b/isabelle/Dockerfile @@ -51,8 +51,9 @@ RUN curl -L -o "Isabelle.tar.gz" "$isabelle" && \ mv afp* afp && \ mkdir .isabelle && \ echo `pwd`/afp/thys > .isabelle/ROOTS && \ - perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings && \ - Isabelle/bin/isabelle build -b $sessions \ - rm -rf /tmp/* + perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="/home/isabelle/.isabelle",g;' Isabelle/etc/settings && \ + Isabelle/bin/isabelle build -j 1 -b $sessions ENV PATH="/home/isabelle/Isabelle/bin:${PATH}" +ENV HOME="/home/isabelle" +USER root diff --git a/isabelle/hooks/build b/isabelle/hooks/build index d277a24..3fbc463 100755 --- a/isabelle/hooks/build +++ b/isabelle/hooks/build @@ -40,7 +40,8 @@ fi ISA_URL="https://isabelle.in.tum.de/website-Isabelle"$VERSION"/dist/Isabelle"$VERSION"_linux.tar.gz" if [ "$LATEST" == "$VERSION" ]; then AFP_URL="https://www.isa-afp.org/release/" - AFP_TAR=`curl -s $AFP_URL | grep "afp-[0-9]" | sed -e 's|^.*href="\(.*\)">.*$|\1|;s|".*$||' | sort -r | head -1` + # AFP_TAR=`curl -s $AFP_URL | grep "afp-[0-9]" | sed -e 's|^.*href="\(.*\)">.*$|\1|;s|".*$||' | sort -r | head -1` + AFP_TAR="afp-current.tar.gz" else if [ "2021" == "$VERSION" ]; then